add an header bar to the main window

[empathy.git] / src / empathy-roster-window.c

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index e06ea9333b92a640dec02232c741cdeed75c2032..e584cdd3db3a851cb65866e3f26355533de45712 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -1301,9 +1301,8 @@ roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action,
       account, room);
   if (chatroom == NULL)
     {
-      DEBUG ("Failed to get chatroom '%s' on '%s': %s",
-          room, path, error->message);
-      g_error_free (error);
+      DEBUG ("Failed to get chatroom '%s' on '%s'",
+          room, path);
       goto out;
     }
 
@@ -1726,7 +1725,7 @@ set_notebook_page (EmpathyRosterWindow *self)
         {
           if (g_settings_get_boolean (self->priv->gsettings_ui,
                 EMPATHY_PREFS_UI_SHOW_OFFLINE))
-            display_page_message (self, _("You haven't added any contact yet"),
+            display_page_message (self, _("You haven't added any contacts yet"),
                 PAGE_MESSAGE_FLAG_ADD_CONTACT);
           else
             display_page_message (self, _("No online contacts"),
@@ -2287,6 +2286,9 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
   GtkWidget *sw;
   gchar *filename;
   GtkWidget *search_vbox;
+  GtkWidget *header_bar;
+  GtkWidget *new_conversation_button;
+  GtkWidget *image;
   guint i;
   EmpathyRosterModel *model;
 
@@ -2327,6 +2329,20 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       NULL);
   g_free (filename);
 
+  header_bar = gtk_header_bar_new ();
+  gtk_header_bar_set_title (GTK_HEADER_BAR(header_bar), _("Conversations"));
+  gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header_bar), TRUE);
+
+  image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
+  new_conversation_button = gtk_button_new ();
+  g_signal_connect (new_conversation_button, "clicked",
+      G_CALLBACK (roster_window_chat_new_message_cb), self);
+  gtk_button_set_image (GTK_BUTTON (new_conversation_button), image);
+  gtk_widget_set_tooltip_text (new_conversation_button, _("New Conversation"));
+  gtk_window_set_titlebar (GTK_WINDOW (self), header_bar);
+  gtk_container_add (GTK_CONTAINER (header_bar), new_conversation_button);
+  gtk_widget_show_all (header_bar);
+
   gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox);
   gtk_widget_show (self->priv->main_vbox);