Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[empathy.git] / libempathy-gtk / empathy-theme-boxes.c

diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index bf97f3f97dcdebf5fcc6b2f74fd4d7b7e9254ec2..cf0c652686893ed224c8d53cddd198ecbaf9b461 100644 (file)
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -196,7 +196,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
        GtkTextChildAnchor   *anchor;
        GtkWidget            *box;
        gchar                *str;
-       time_t                time_;
+       gint64                time_;
        gchar                *tmp;
        GtkTextIter           start;
        gboolean              color_set;
@@ -206,7 +206,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
        gboolean              consecutive;
 
        contact = empathy_message_get_sender (msg);
-       name = empathy_contact_get_alias (contact);
+       name = empathy_contact_get_logged_alias (contact);
        last_contact = empathy_chat_text_view_get_last_contact (view);
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (theme));
        time_ = empathy_message_get_timestamp (msg);
@@ -239,7 +239,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 
        /* Create a hbox for the header and resize it when the view allocation
         * changes */
-       box = gtk_hbox_new (FALSE, 0);
+       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
        g_signal_connect_object (view, "size-allocate",
                                 G_CALLBACK (table_size_allocate_cb),
                                 box, 0);
@@ -337,7 +337,8 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 
 static void
 theme_boxes_append_message (EmpathyChatTextView *view,
-                           EmpathyMessage      *message)
+                           EmpathyMessage      *message,
+                           gboolean             should_highlight)
 {
        EmpathyContact *sender;
 
@@ -349,7 +350,7 @@ theme_boxes_append_message (EmpathyChatTextView *view,
                gchar *body;
 
                body = g_strdup_printf (" * %s %s",
-                                       empathy_contact_get_alias (sender),
+                                       empathy_contact_get_logged_alias (sender),
                                        empathy_message_get_body (message));
                empathy_chat_text_view_append_body (EMPATHY_CHAT_TEXT_VIEW (view),
                                                    body,