X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-utils.c;h=98e1d68890778706cfb130b71fd1202b9e674ce5;hb=a40d7f37a69592c6176ec928cc1e7f957f10058f;hp=4a8af732ecc17d18843246ef21fd8cb80a42b66c;hpb=26bbed080f7d04a8434a8b348fb4136aba4c6f23;p=modest diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c index 4a8af73..98e1d68 100644 --- a/src/maemo/modest-maemo-utils.c +++ b/src/maemo/modest-maemo-utils.c @@ -54,6 +54,38 @@ "',member='" BTNAME_SIG_CHANGED "'" +GtkWidget* +modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager) +{ + GtkWidget *main_menu; + GtkWidget *menubar; + GList *iter; + + g_return_val_if_fail (ui_manager, NULL); + + /* Create new main menu */ + main_menu = gtk_menu_new(); + + /* Get the menubar from the UI manager */ + menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); + + iter = gtk_container_get_children (GTK_CONTAINER (menubar)); + while (iter) { + GtkWidget *menu; + + menu = GTK_WIDGET (iter->data); + gtk_widget_reparent(menu, main_menu); + + iter = g_list_next (iter); + } + return main_menu; +} + + + + + + static void update_device_name_from_msg (DBusMessage *message) { @@ -121,8 +153,6 @@ get_device_name_from_dbus () DBusMessage *request; DBusError error; DBusPendingCall *call = NULL; - - g_warning ("get device name from dbus"); dbus_error_init (&error); if (!conn) {