2007-04-30 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / modest-maemo-utils.c

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index 1fca24e..f63b9bc 100644 (file)
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -54,6 +54,34 @@
                           "',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)
 {
@@ -63,20 +91,14 @@ update_device_name_from_msg (DBusMessage *message)
        dbus_error_init (&error);
 
        if (dbus_set_error_from_message (&error, message)) {
-               g_printerr ("modest: failed to get bt name: %s\n", error.message);
+               g_printerr ("modest: failed to get bluetooth name: %s\n", error.message);
                dbus_error_free (&error);
-               modest_conf_set_string (modest_runtime_get_conf(),
-                                       MODEST_CONF_DEVICE_NAME,
-                                       MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
-                                       NULL);
-                                       
        } else {
                const gchar *device_name;
                if (!dbus_message_iter_init (message, &iter)) {
                        g_printerr ("modest: message did not have argument\n");
                        return;
                }
-
                dbus_message_iter_get_basic (&iter, &device_name);
                g_warning ("update device name: %s", device_name);
                modest_conf_set_string (modest_runtime_get_conf(),