Add the app menu using the same model as the menu button

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 32cd192cb76aad4997f3b1e4b2fe9d72eb2f2f58..f2549b82edb27b2dddd55dede3ae80bd20d3bc9d 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -2569,6 +2569,15 @@ empathy_roster_window_get_property (GObject    *object,
     }
 }
 
+static void
+empathy_roster_window_constructed (GObject *self)
+{
+  G_OBJECT_CLASS (empathy_roster_window_parent_class)->constructed (self);
+
+  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (self),
+      FALSE);
+}
+
 static void
 empathy_roster_window_class_init (EmpathyRosterWindowClass *klass)
 {
@@ -2577,6 +2586,7 @@ empathy_roster_window_class_init (EmpathyRosterWindowClass *klass)
 
   object_class->finalize = empathy_roster_window_finalize;
   object_class->constructor = empathy_roster_window_constructor;
+  object_class->constructed = empathy_roster_window_constructed;
 
   object_class->set_property = empathy_roster_window_set_property;
   object_class->get_property = empathy_roster_window_get_property;

diff --git a/src/empathy.c b/src/empathy.c
index 712632f7e5567e1ca217fc7f1f09d4bf8b26b619..774365bf7d0a1bd165db34f275ce6a98b3881e1f 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -332,6 +332,9 @@ empathy_app_command_line (GApplication *app,
     {
       GError *error = NULL;
       TpDBusDaemon *dbus;
+      GtkBuilder *gui;
+      GMenuModel *menu;
+      char *filename;
 
       /* Create the FT factory */
       self->ft_factory = empathy_ft_factory_dup_singleton ();
@@ -349,6 +352,18 @@ empathy_app_command_line (GApplication *app,
 
       self->activated = TRUE;
 
+      /* set up the app menu */
+      filename = empathy_file_lookup (
+          "empathy-roster-window-menubar.ui", "src");
+      gui = empathy_builder_get_file (filename,
+          "menubutton", &menu,
+          NULL);
+
+      gtk_application_set_app_menu (GTK_APPLICATION (self), menu);
+
+      g_free (filename);
+      g_object_unref (gui);
+
       /* Setting up UI */
       self->window = empathy_roster_window_new (GTK_APPLICATION (app));