diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-05-15 10:16:45 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-05-15 18:40:27 +0800 |
| commit | a51af40f723c6929a461b9af26eaa10b4b714c84 (patch) | |
| tree | c8f09cde3e6c28b42043988f9a896488e7c9a1a1 /src/empathy.c | |
| parent | 06d7e54c62318a502d9e726bdbda16caeaf898e6 (diff) | |
| download | gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar.gz gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar.bz2 gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar.lz gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar.xz gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.tar.zst gsoc2013-empathy-a51af40f723c6929a461b9af26eaa10b4b714c84.zip | |
Remove menu button, have only app menu
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/empathy.c b/src/empathy.c index 774365bf7..9ba923602 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -332,9 +332,6 @@ 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 (); @@ -352,20 +349,11 @@ 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)); + gtk_application_set_app_menu (GTK_APPLICATION (self), + empathy_roster_window_get_menu_model ( + EMPATHY_ROSTER_WINDOW (self->window))); gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (self->window)); |