From 2dc2f7e32f57720023b6c888146e8a09d850972a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 16 Jan 2008 15:32:35 +0000 Subject: [PATCH] Rename BlockType to EMPATHY_CHAT_VIEW_BLOCK to respect namespace svn path=/trunk/; revision=563 --- libempathy-gtk/empathy-chat-view.c | 18 +++++++++--------- libempathy-gtk/empathy-chat-view.h | 18 +++++++++--------- libempathy-gtk/empathy-theme-boxes.c | 16 ++++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c index c7428e9d..d6c85606 100644 --- a/libempathy-gtk/empathy-chat-view.c +++ b/libempathy-gtk/empathy-chat-view.c @@ -70,7 +70,7 @@ struct _EmpathyChatViewPriv { EmpathyTheme *theme; time_t last_timestamp; - BlockType last_block_type; + EmpathyChatViewBlock last_block_type; gboolean allow_scrolling; guint scroll_timeout; @@ -158,7 +158,7 @@ empathy_chat_view_init (EmpathyChatView *view) priv->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - priv->last_block_type = BLOCK_TYPE_NONE; + priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE; priv->last_timestamp = 0; priv->allow_scrolling = TRUE; @@ -638,7 +638,7 @@ chat_view_theme_changed_cb (EmpathyThemeManager *manager, priv = GET_PRIV (view); - priv->last_block_type = BLOCK_TYPE_NONE; + priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE; empathy_conf_get_bool (empathy_conf_get (), EMPATHY_PREFS_CHAT_THEME_CHAT_ROOM, @@ -821,7 +821,7 @@ empathy_chat_view_append_event (EmpathyChatView *view, empathy_chat_view_scroll_down (view); } - priv->last_block_type = BLOCK_TYPE_EVENT; + priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_EVENT; } void @@ -891,7 +891,7 @@ empathy_chat_view_append_button (EmpathyChatView *view, empathy_chat_view_scroll_down (view); } - priv->last_block_type = BLOCK_TYPE_INVITE; + priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_INVITE; } void @@ -996,7 +996,7 @@ empathy_chat_view_clear (EmpathyChatView *view) */ priv = GET_PRIV (view); - priv->last_block_type = BLOCK_TYPE_NONE; + priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE; priv->last_timestamp = 0; } @@ -1512,7 +1512,7 @@ empathy_chat_view_set_last_timestamp (EmpathyChatView *view, priv->last_timestamp = timestamp; } -BlockType +EmpathyChatViewBlock empathy_chat_view_get_last_block_type (EmpathyChatView *view) { EmpathyChatViewPriv *priv; @@ -1525,8 +1525,8 @@ empathy_chat_view_get_last_block_type (EmpathyChatView *view) } void -empathy_chat_view_set_last_block_type (EmpathyChatView *view, - BlockType block_type) +empathy_chat_view_set_last_block_type (EmpathyChatView *view, + EmpathyChatViewBlock block_type) { EmpathyChatViewPriv *priv; diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h index 37a7f997..58219ca0 100644 --- a/libempathy-gtk/empathy-chat-view.h +++ b/libempathy-gtk/empathy-chat-view.h @@ -54,13 +54,13 @@ struct _EmpathyChatViewClass { }; typedef enum { - BLOCK_TYPE_NONE, - BLOCK_TYPE_SELF, - BLOCK_TYPE_OTHER, - BLOCK_TYPE_EVENT, - BLOCK_TYPE_TIME, - BLOCK_TYPE_INVITE -} BlockType; + EMPATHY_CHAT_VIEW_BLOCK_NONE, + EMPATHY_CHAT_VIEW_BLOCK_SELF, + EMPATHY_CHAT_VIEW_BLOCK_OTHER, + EMPATHY_CHAT_VIEW_BLOCK_EVENT, + EMPATHY_CHAT_VIEW_BLOCK_TIME, + EMPATHY_CHAT_VIEW_BLOCK_INVITE +} EmpathyChatViewBlock; GType empathy_chat_view_get_type (void) G_GNUC_CONST; EmpathyChatView *empathy_chat_view_new (void); @@ -106,9 +106,9 @@ void empathy_chat_view_set_is_group_chat (EmpathyChatView *view, time_t empathy_chat_view_get_last_timestamp (EmpathyChatView *view); void empathy_chat_view_set_last_timestamp (EmpathyChatView *view, time_t timestamp); -BlockType empathy_chat_view_get_last_block_type (EmpathyChatView *view); +EmpathyChatViewBlock empathy_chat_view_get_last_block_type (EmpathyChatView *view); void empathy_chat_view_set_last_block_type (EmpathyChatView *view, - BlockType block_type); + EmpathyChatViewBlock block_type); EmpathyContact * empathy_chat_view_get_last_contact (EmpathyChatView *view); void empathy_chat_view_set_last_contact (EmpathyChatView *view, EmpathyContact *contact); diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index 87eac87d..30ae59f3 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -559,16 +559,16 @@ theme_boxes_maybe_append_header (EmpathyTheme *theme, /* Only insert a header if the previously inserted block is not the same * as this one. This catches all the different cases: */ - if (empathy_chat_view_get_last_block_type (view) != BLOCK_TYPE_SELF && - empathy_chat_view_get_last_block_type (view) != BLOCK_TYPE_OTHER) { + if (empathy_chat_view_get_last_block_type (view) != EMPATHY_CHAT_VIEW_BLOCK_SELF && + empathy_chat_view_get_last_block_type (view) != EMPATHY_CHAT_VIEW_BLOCK_OTHER) { header = TRUE; } else if (from_self && - empathy_chat_view_get_last_block_type (view) == BLOCK_TYPE_OTHER) { + empathy_chat_view_get_last_block_type (view) == EMPATHY_CHAT_VIEW_BLOCK_OTHER) { header = TRUE; } else if (!from_self && - empathy_chat_view_get_last_block_type (view) == BLOCK_TYPE_SELF) { + empathy_chat_view_get_last_block_type (view) == EMPATHY_CHAT_VIEW_BLOCK_SELF) { header = TRUE; } else if (!from_self && @@ -710,10 +710,10 @@ theme_boxes_append_message (EmpathyTheme *theme, } if (empathy_contact_is_user (sender)) { - empathy_chat_view_set_last_block_type (view, BLOCK_TYPE_SELF); + empathy_chat_view_set_last_block_type (view, EMPATHY_CHAT_VIEW_BLOCK_SELF); empathy_chat_view_set_last_contact (view, NULL); } else { - empathy_chat_view_set_last_block_type (view, BLOCK_TYPE_OTHER); + empathy_chat_view_set_last_block_type (view, EMPATHY_CHAT_VIEW_BLOCK_OTHER); empathy_chat_view_set_last_contact (view, sender); } } @@ -741,7 +741,7 @@ theme_boxes_append_event (EmpathyTheme *theme, NULL); g_free (msg); - empathy_chat_view_set_last_block_type (view, BLOCK_TYPE_EVENT); + empathy_chat_view_set_last_block_type (view, EMPATHY_CHAT_VIEW_BLOCK_EVENT); } static void @@ -804,7 +804,7 @@ theme_boxes_append_timestamp (EmpathyTheme *theme, "fancy-time", NULL); - empathy_chat_view_set_last_block_type (view, BLOCK_TYPE_TIME); + empathy_chat_view_set_last_block_type (view, EMPATHY_CHAT_VIEW_BLOCK_TIME); empathy_chat_view_set_last_timestamp (view, timestamp); } -- 2.39.2