* Fixes NB#93064, replaced logical ids by the new ones
[modest] / src / hildon2 / modest-maemo-global-settings-dialog.c
index 6d96477..1326c6c 100644 (file)
 #include <gtk/gtknotebook.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhseparator.h>
 #include "modest-runtime.h"
 #include "widgets/modest-global-settings-dialog-priv.h"
-#include "widgets/modest-combo-box.h"
+#include "modest-selector-picker.h"
+#include "hildon/hildon-pannable-area.h"
 #include "modest-maemo-global-settings-dialog.h"
 #include "widgets/modest-ui-constants.h"
+#include "modest-text-utils.h"
 #include <tny-account-store.h>
+#include <modest-account-mgr-helpers.h>
 
 
 #define MSG_SIZE_MAX_VAL 5000
@@ -63,15 +65,7 @@ static void modest_maemo_global_settings_dialog_finalize   (GObject *obj);
 
 static ModestConnectedVia current_connection (void);
 
-/* list my signals  */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
 static GtkWidget* create_updating_page   (ModestMaemoGlobalSettingsDialog *self);
-static GtkWidget* create_composing_page  (ModestMaemoGlobalSettingsDialog *self);
 
 static gboolean   on_range_error         (HildonNumberEditor *editor, 
                                          HildonNumberEditorErrorType type,
@@ -81,17 +75,14 @@ static void       on_size_notify         (HildonNumberEditor *editor,
                                          GParamSpec *arg1,
                                          gpointer user_data);
 
-static void       on_auto_update_toggled (GtkToggleButton *togglebutton,
+static void       on_auto_update_clicked (GtkButton *button,
                                          gpointer user_data);
-
-static gboolean   on_inner_tabs_key_pressed (GtkWidget *widget,
-                                            GdkEventKey *event,
-                                            gpointer user_data);
+static void       update_sensitive       (ModestGlobalSettingsDialog *dialog);
+static ModestPairList * get_accounts_list (void);
 
 typedef struct _ModestMaemoGlobalSettingsDialogPrivate ModestMaemoGlobalSettingsDialogPrivate;
 struct _ModestMaemoGlobalSettingsDialogPrivate {
        ModestPairList *connect_via_list;
-       gint switch_handler;
 };
 #define MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                            MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, \
@@ -99,9 +90,6 @@ struct _ModestMaemoGlobalSettingsDialogPrivate {
 /* globals */
 static GtkDialogClass *parent_class = NULL;
 
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
 GType
 modest_maemo_global_settings_dialog_get_type (void)
 {
@@ -145,61 +133,6 @@ typedef struct {
        GtkWidget *focus_widget;
 } SwitchPageHelper;
 
-static gboolean
-idle_select_default_focus (gpointer data) 
-{
-       ModestGlobalSettingsDialogPrivate *ppriv;
-       ModestMaemoGlobalSettingsDialogPrivate *priv;
-       SwitchPageHelper *helper;
-
-       helper = (SwitchPageHelper *) data;
-       priv  = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (helper->dia);
-       ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (helper->dia);
-
-       /* Grab focus, we need to block in order to prevent a
-          recursive call to this callback */
-       g_signal_handler_block (G_OBJECT (ppriv->notebook), priv->switch_handler);
-
-       /* This is a GDK lock because we are an idle callback and
-        * the code below is or does Gtk+ code */
-
-       gdk_threads_enter (); /* CHECKED */
-       gtk_widget_grab_focus (helper->focus_widget);
-       gdk_threads_leave (); /* CHECKED */
-
-       g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler);
-       g_free (helper);
-
-       return FALSE;
-}
-
-
-static void
-on_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
-{
-       /* grab the focus to the default element in the current page */
-       GtkWidget *selected_page = NULL, *focus_item = NULL;
-       SwitchPageHelper *helper;
-
-       selected_page = gtk_notebook_get_nth_page (notebook, page_num);
-       focus_item = GTK_WIDGET(g_object_get_data (G_OBJECT(selected_page), DEFAULT_FOCUS_WIDGET));
-       if (!focus_item) {
-               g_printerr ("modest: cannot get focus item\n");
-               return;
-       }
-
-       /* Create the helper */
-       helper = g_malloc0 (sizeof (SwitchPageHelper));
-       helper->dia = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG (user_data);
-       helper->focus_widget = focus_item;
-
-       /* Focus the widget in an idle. We need to do this in an idle,
-          because this handler is executed *before* the page was
-          really switched, so the focus is not placed in the right
-          widget */
-       g_idle_add (idle_select_default_focus, helper);
-}
-
 
 static void
 modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
@@ -211,40 +144,24 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
 
        ppriv->updating_page = create_updating_page (self);
-       ppriv->composing_page = create_composing_page (self);
 
        /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+       gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
 
        /* Set the default focusable widgets */
        g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,
                           (gpointer)ppriv->auto_update);
-       g_object_set_data (G_OBJECT(ppriv->composing_page), DEFAULT_FOCUS_WIDGET,
-                          (gpointer)ppriv->msg_format);
-
-       /* Add the notebook pages: */
-       gtk_notebook_append_page (GTK_NOTEBOOK (ppriv->notebook), ppriv->updating_page, 
-                                 gtk_label_new (_("mcen_ti_options_updating")));
-       gtk_notebook_append_page (GTK_NOTEBOOK (ppriv->notebook), ppriv->composing_page, 
-                                 gtk_label_new (_("mcen_ti_options_composing")));
-               
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
-       gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
-
-       gtk_window_set_default_size (GTK_WINDOW (self), 700, 300);
 
-       g_signal_connect (G_OBJECT (self), "key-press-event",
-                         G_CALLBACK (on_inner_tabs_key_pressed), self);
-       priv->switch_handler = g_signal_connect (G_OBJECT(ppriv->notebook), "switch-page",
-                                                G_CALLBACK(on_switch_page), self);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->updating_page);
+       gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, 340);
 
        /* Load current config */
        _modest_global_settings_dialog_load_conf (MODEST_GLOBAL_SETTINGS_DIALOG (self));
+       /* force update of sensitiveness */
+       update_sensitive (MODEST_GLOBAL_SETTINGS_DIALOG (self));
 
        /* Set first page */
-       gtk_notebook_set_current_page (GTK_NOTEBOOK (ppriv->notebook), 0);
-
        hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_options_dialog",
                                        modest_maemo_utils_get_osso_context());
 }
@@ -258,12 +175,6 @@ modest_maemo_global_settings_dialog_finalize (GObject *obj)
        priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
 
-       if (priv->switch_handler && ppriv->notebook) {
-               /* TODO: This causes a g_warning and a valgrind mem error: */
-               /* g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);*/
-               priv->switch_handler = 0;
-       }
-
 /*     free/unref instance resources here */
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -280,156 +191,156 @@ modest_maemo_global_settings_dialog_new (void)
 static GtkWidget*
 create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 {
-       GtkWidget *vbox, *vbox_update, *vbox_limit, *caption;
-       GtkSizeGroup *size_group;
+       GtkWidget *vbox, *vbox_update, *vbox_limit, *label, *hbox;
+       GtkSizeGroup *title_size_group;
+       GtkSizeGroup *value_size_group;
        ModestGlobalSettingsDialogPrivate *ppriv;
-       GtkWidget *scrollwin = NULL;
-       GtkAdjustment *focus_adjustment = NULL;
+       GtkWidget *pannable;
+       ModestMaemoGlobalSettingsDialogPrivate *priv;
 
+       priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
-       scrollwin = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), 
-                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-       vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
 
-       vbox_update = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
-       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       vbox_update = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
        /* Auto update */
-       ppriv->auto_update = gtk_check_button_new ();
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_options_autoupdate"), 
-                                     ppriv->auto_update, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox_update), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-       g_signal_connect (ppriv->auto_update, "toggled", G_CALLBACK (on_auto_update_toggled), self);
+       ppriv->auto_update = hildon_check_button_new (MODEST_EDITABLE_SIZE);
+       gtk_button_set_label (GTK_BUTTON (ppriv->auto_update), _("mcen_fi_options_autoupdate"));
+       gtk_button_set_alignment (GTK_BUTTON (ppriv->auto_update), 0.0, 0.5);
+       gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->auto_update, FALSE, FALSE, MODEST_MARGIN_HALF);
+       g_signal_connect (ppriv->auto_update, "clicked", G_CALLBACK (on_auto_update_clicked), self);
 
        /* Connected via */
 
-       /* Note: This ModestPairList* must exist for as long as the combo
-        * that uses it, because the ModestComboBox uses the ID opaquely, 
+       /* Note: This ModestPairList* must exist for as long as the picker
+        * that uses it, because the ModestSelectorPicker uses the ID opaquely, 
         * so it can't know how to manage its memory. */ 
        ppriv->connect_via_list = _modest_global_settings_dialog_get_connected_via ();
-       ppriv->connect_via = modest_combo_box_new (ppriv->connect_via_list, g_int_equal);
-
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_options_connectiontype"),
-                                     ppriv->connect_via, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox_update), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       ppriv->connect_via = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+                                                        HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+                                                        ppriv->connect_via_list, g_int_equal);
+       modest_maemo_utils_set_vbutton_layout (title_size_group, 
+                                              _("mcen_fi_options_connectiontype"),
+                                              ppriv->connect_via);
+       gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->connect_via, FALSE, FALSE, MODEST_MARGIN_HALF);
 
        /* Update interval */
 
-       /* Note: This ModestPairList* must exist for as long as the combo
-        * that uses it, because the ModestComboBox uses the ID opaquely, 
+       /* Note: This ModestPairList* must exist for as long as the picker
+        * that uses it, because the ModestSelectorPicker uses the ID opaquely, 
         * so it can't know how to manage its memory. */ 
        ppriv->update_interval_list = _modest_global_settings_dialog_get_update_interval ();
-       ppriv->update_interval = modest_combo_box_new (ppriv->update_interval_list, g_int_equal);
-
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_options_updateinterval"),
-                                     ppriv->update_interval, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox_update), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       ppriv->update_interval = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+                                                            HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+                                                            ppriv->update_interval_list, g_int_equal);
+       modest_maemo_utils_set_vbutton_layout (title_size_group, 
+                                              _("mcen_fi_options_updateinterval"), 
+                                              ppriv->update_interval);
+       gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->update_interval, FALSE, FALSE, MODEST_MARGIN_HALF);
+
+       /* Default account selector */
+       ppriv->accounts_list = get_accounts_list ();
+       ppriv->default_account_selector = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+                                                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+                                                                     ppriv->accounts_list,
+                                                                     g_str_equal);
+       if (ppriv->accounts_list == NULL) {
+               gtk_widget_set_sensitive (GTK_WIDGET (ppriv->default_account_selector), FALSE);
+       } else {
+               gchar *default_account;
+
+               default_account = modest_account_mgr_get_default_account (
+                       modest_runtime_get_account_mgr ());
+               if (default_account) {
+                       modest_selector_picker_set_active_id (
+                               MODEST_SELECTOR_PICKER (ppriv->default_account_selector),
+                               default_account);
+                       g_free (default_account);
+               }
+       }
+       modest_maemo_utils_set_vbutton_layout (title_size_group, 
+                                              _("mcen_ti_default_account"), 
+                                              ppriv->default_account_selector);
+       gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->default_account_selector, 
+                           FALSE, FALSE, MODEST_MARGIN_HALF);
 
        /* Add to vbox */
        gtk_box_pack_start (GTK_BOX (vbox), vbox_update, FALSE, FALSE, MODEST_MARGIN_HALF);
 
-       /* Separator */
-       gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, MODEST_MARGIN_HALF);
+       g_object_unref (title_size_group);
+       g_object_unref (value_size_group);
 
        /* Limits */
-       vbox_limit = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
-       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       vbox_limit = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
        /* Size limit */
        ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
        hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
        g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
        g_signal_connect (ppriv->size_limit, "notify", G_CALLBACK (on_size_notify), self);
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_advsetup_sizelimit"), 
-                                     ppriv->size_limit,
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox_limit), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-
-       /* Play sound */
-       ppriv->play_sound = gtk_check_button_new ();
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_options_playsound"), 
-                                     ppriv->play_sound, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox_limit), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-
-       /* Add to vbox */
+       label = gtk_label_new (_("mcen_fi_advsetup_sizelimit"));
+       hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), ppriv->size_limit, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox_limit), hbox, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), vbox);
-       focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), focus_adjustment);
-       gtk_widget_show (scrollwin);
-       
-       return scrollwin;
-}
+       gtk_widget_show_all (vbox_limit);
 
-/*
- * Creates the composing page
- */
-static GtkWidget* 
-create_composing_page (ModestMaemoGlobalSettingsDialog *self)
-{
-       GtkWidget *vbox;
-       GtkSizeGroup *size_group;
-       ModestGlobalSettingsDialogPrivate *ppriv;
-       GtkWidget *caption;
+       /* Note: This ModestPairList* must exist for as long as the picker
+        * that uses it, because the ModestSelectorPicker uses the ID opaquely, 
+        * so it can't know how to manage its memory. */ 
+       ppriv->msg_format_list = _modest_global_settings_dialog_get_msg_formats ();
+       ppriv->msg_format = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+                                                       HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+                                                       ppriv->msg_format_list, g_int_equal);
+       modest_maemo_utils_set_vbutton_layout (title_size_group, 
+                                              _("mcen_fi_options_messageformat"), 
+                                              ppriv->msg_format);
 
-       ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
-       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-       vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       gtk_box_pack_start (GTK_BOX (vbox), ppriv->msg_format, FALSE, FALSE, MODEST_MARGIN_HALF);
 
-       /* Update interval */
+       pannable = g_object_new (HILDON_TYPE_PANNABLE_AREA, "initial-hint", TRUE, NULL);
 
-       /* Note: This ModestPairList* must exist for as long as the combo
-        * that uses it, because the ModestComboBox uses the ID opaquely, 
-        * so it can't know how to manage its memory. */ 
-       ppriv->msg_format_list = _modest_global_settings_dialog_get_msg_formats ();
-       ppriv->msg_format = modest_combo_box_new (ppriv->msg_format_list, g_int_equal);
+       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), vbox);
+       gtk_widget_show (vbox);
+       gtk_widget_show (pannable);
 
-       caption = hildon_caption_new (size_group, 
-                                     _("mcen_fi_options_messageformat"),
-                                     ppriv->msg_format, 
-                                     NULL, 
-                                     HILDON_CAPTION_MANDATORY);
-       gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       g_object_unref (title_size_group);
+       g_object_unref (value_size_group);
 
-       return vbox;
+       return pannable;
 }
 
+
 static void
-on_auto_update_toggled (GtkToggleButton *togglebutton,
-                       gpointer user_data)
+update_sensitive (ModestGlobalSettingsDialog *dialog)
 {
        ModestGlobalSettingsDialogPrivate *ppriv;
-       GtkWidget *caption1, *caption2;
 
-       ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
-       caption1 = gtk_widget_get_ancestor (ppriv->connect_via, HILDON_TYPE_CAPTION);
-       caption2 = gtk_widget_get_ancestor (ppriv->update_interval, HILDON_TYPE_CAPTION);
+       g_return_if_fail (MODEST_IS_GLOBAL_SETTINGS_DIALOG (dialog));
+       ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (dialog);
 
-       if (gtk_toggle_button_get_active (togglebutton)) {
-               gtk_widget_set_sensitive (caption1, TRUE);
-               gtk_widget_set_sensitive (caption2, TRUE);
+       if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (ppriv->auto_update))) {
+               gtk_widget_set_sensitive (ppriv->connect_via, TRUE);
+               gtk_widget_set_sensitive (ppriv->update_interval, TRUE);
        } else {
-               gtk_widget_set_sensitive (caption1, FALSE);
-               gtk_widget_set_sensitive (caption2, FALSE);
+               gtk_widget_set_sensitive (ppriv->connect_via, FALSE);
+               gtk_widget_set_sensitive (ppriv->update_interval, FALSE);
        }
 }
 
+static void
+on_auto_update_clicked (GtkButton *button,
+                       gpointer user_data)
+{
+       g_return_if_fail (MODEST_IS_GLOBAL_SETTINGS_DIALOG (user_data));
+       update_sensitive ((ModestGlobalSettingsDialog *) user_data);
+}
 static gboolean
 on_range_error (HildonNumberEditor *editor, 
                HildonNumberEditorErrorType type,
@@ -499,25 +410,48 @@ current_connection (void)
        return modest_platform_get_current_connection ();
 }
 
-static gboolean
-on_inner_tabs_key_pressed (GtkWidget *widget,
-                          GdkEventKey *event,
-                          gpointer user_data)
+static ModestPairList * 
+get_accounts_list (void)
 {
-       ModestGlobalSettingsDialogPrivate *ppriv;
-       gboolean retval = FALSE;
+       GSList *list = NULL;
+       GSList *cursor, *account_names;
+       ModestAccountMgr *account_mgr;
+
+       account_mgr = modest_runtime_get_account_mgr ();
+
+       cursor = account_names = modest_account_mgr_account_names (account_mgr, TRUE /*only enabled*/);
+       while (cursor) {
+               gchar *account_name;
+               ModestAccountSettings *settings;
+               ModestServerAccountSettings *store_settings;
+               
+               account_name = (gchar*)cursor->data;
+               
+               settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+               if (!settings) {
+                       g_printerr ("modest: failed to get account data for %s\n", account_name);
+                       continue;
+               }
+               store_settings = modest_account_settings_get_store_settings (settings);
 
-       ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
+               /* don't display accounts without stores */
+               if (modest_server_account_settings_get_account_name (store_settings) != NULL) {
 
-       if (widget == ppriv->notebook) {
-               if (event->keyval == GDK_Right) {
-                       gtk_notebook_next_page (GTK_NOTEBOOK (ppriv->notebook));
-                       retval = TRUE;
-               } else if (event->keyval == GDK_Left) {
-                       gtk_notebook_prev_page (GTK_NOTEBOOK (ppriv->notebook));
-                       retval = TRUE;
+                       if (modest_account_settings_get_enabled (settings)) {
+                               ModestPair *pair;
+
+                               pair = modest_pair_new (
+                                       g_strdup (account_name),
+                                       g_strdup (modest_account_settings_get_display_name (settings)),
+                                       FALSE);
+                               list = g_slist_prepend (list, pair);
+                       }
                }
+               
+               g_object_unref (store_settings);
+               g_object_unref (settings);
+               cursor = cursor->next;
        }
 
-       return retval;
+       return (ModestPairList *) g_slist_reverse (list);
 }