From: Jose Dapena Paz Date: Thu, 30 Oct 2008 14:51:22 +0000 (+0000) Subject: * Now, in fremantle target, we can change the default account from X-Git-Tag: git_migration_finished~1065 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=4e97d7207dbb185694271b4296a569ea6cf5449f * Now, in fremantle target, we can change the default account from global settings dialog. pmo-trunk-r6205 --- diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 55e1770..f36bf4d 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -641,6 +641,12 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_email), on_entry_max, self); + /* Delete button: */ + if (!priv->button_delete) + priv->button_delete = gtk_button_new_with_label (_("mcen_bd_delete")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->action_area), priv->button_delete, + FALSE, FALSE, 0); + /* Signature button: */ if (!priv->button_signature) priv->button_signature = gtk_button_new_with_label (_("mcen_fi_email_signature")); @@ -648,12 +654,6 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) FALSE, FALSE, 0); gtk_widget_show (priv->button_signature); - /* Delete button: */ - if (!priv->button_delete) - priv->button_delete = gtk_button_new_with_label (_("mcen_bd_delete")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->action_area), priv->button_delete, - FALSE, FALSE, 0); - g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); diff --git a/src/hildon2/modest-maemo-global-settings-dialog.c b/src/hildon2/modest-maemo-global-settings-dialog.c index fb64ea4..1326c6c 100644 --- a/src/hildon2/modest-maemo-global-settings-dialog.c +++ b/src/hildon2/modest-maemo-global-settings-dialog.c @@ -41,7 +41,6 @@ #include #include #include -#include #include "modest-runtime.h" #include "widgets/modest-global-settings-dialog-priv.h" #include "modest-selector-picker.h" @@ -50,6 +49,7 @@ #include "widgets/modest-ui-constants.h" #include "modest-text-utils.h" #include +#include #define MSG_SIZE_MAX_VAL 5000 @@ -78,6 +78,7 @@ static void on_size_notify (HildonNumberEditor *editor, static void on_auto_update_clicked (GtkButton *button, gpointer user_data); static void update_sensitive (ModestGlobalSettingsDialog *dialog); +static ModestPairList * get_accounts_list (void); typedef struct _ModestMaemoGlobalSettingsDialogPrivate ModestMaemoGlobalSettingsDialogPrivate; struct _ModestMaemoGlobalSettingsDialogPrivate { @@ -195,11 +196,13 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) GtkSizeGroup *value_size_group; ModestGlobalSettingsDialogPrivate *ppriv; GtkWidget *pannable; + ModestMaemoGlobalSettingsDialogPrivate *priv; + priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self); ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self); - 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); + 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); @@ -238,17 +241,40 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) 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); + 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); @@ -265,9 +291,6 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show_all (vbox_limit); - /* Separator */ - gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, MODEST_MARGIN_HALF); - /* 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. */ @@ -387,3 +410,48 @@ current_connection (void) return modest_platform_get_current_connection (); } +static ModestPairList * +get_accounts_list (void) +{ + 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); + + /* don't display accounts without stores */ + if (modest_server_account_settings_get_account_name (store_settings) != NULL) { + + 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 (ModestPairList *) g_slist_reverse (list); +} diff --git a/src/widgets/modest-global-settings-dialog-priv.h b/src/widgets/modest-global-settings-dialog-priv.h index ec351a9..b1f055d 100644 --- a/src/widgets/modest-global-settings-dialog-priv.h +++ b/src/widgets/modest-global-settings-dialog-priv.h @@ -40,6 +40,7 @@ typedef struct _ModestGlobalSettingsState { gint connect_via; gint update_interval; gint size_limit; + gchar *default_account; gboolean play_sound; gboolean prefer_formatted_text; } ModestGlobalSettingsState; @@ -55,6 +56,9 @@ struct _ModestGlobalSettingsDialogPrivate { ModestPairList *connect_via_list; GtkWidget *connect_via; + ModestPairList *accounts_list; + GtkWidget *default_account_selector; + ModestPairList *update_interval_list; GtkWidget *update_interval; diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c index ee6fc92..45a0145 100644 --- a/src/widgets/modest-global-settings-dialog.c +++ b/src/widgets/modest-global-settings-dialog.c @@ -136,6 +136,8 @@ modest_global_settings_dialog_init (ModestGlobalSettingsDialog *self) priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self); priv->notebook = gtk_notebook_new (); + priv->default_account_selector = NULL; + priv->accounts_list = NULL; /* Connect to the dialog's response signal: */ g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self); @@ -154,6 +156,7 @@ modest_global_settings_dialog_finalize (GObject *obj) modest_pair_list_free (priv->connect_via_list); modest_pair_list_free (priv->update_interval_list); modest_pair_list_free (priv->msg_format_list); + modest_pair_list_free (priv->accounts_list); G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -364,9 +367,11 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv, #ifdef MODEST_TOOLKIT_HILDON2 id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->connect_via)); state->auto_update = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auto_update)); + state->default_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->default_account_selector)); #else id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->connect_via)); state->auto_update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auto_update)); + state->default_account = NULL; #endif state->connect_via = *id; #ifndef MODEST_TOOLKIT_GTK @@ -418,24 +423,30 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self) RETURN_FALSE_ON_ERROR(error); modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, current_state.prefer_formatted_text, NULL); RETURN_FALSE_ON_ERROR(error); + if (current_state.default_account && + (!priv->initial_state.default_account || + strcmp (current_state.default_account, priv->initial_state.default_account)!= 0)) { + modest_account_mgr_set_default_account (modest_runtime_get_account_mgr (), + current_state.default_account); + } /* Apply changes */ if (priv->initial_state.auto_update != current_state.auto_update || priv->initial_state.connect_via != current_state.connect_via || priv->initial_state.update_interval != current_state.update_interval) { - + TnyAccountStore *account_store; TnyDevice *device; - + if (!current_state.auto_update) { modest_platform_set_update_interval (0); /* To avoid a new indentation level */ goto exit; } - + account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()); device = tny_account_store_get_device (account_store); - + if (tny_device_is_online (device)) { /* If connected via any then set update interval */ if (current_state.connect_via == MODEST_CONNECTED_VIA_ANY) { @@ -459,7 +470,7 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self) } g_object_unref (device); } - + exit: return TRUE; } @@ -473,7 +484,10 @@ settings_changed (ModestGlobalSettingsState initial_state, initial_state.update_interval != current_state.update_interval || initial_state.size_limit != current_state.size_limit || initial_state.play_sound != current_state.play_sound || - initial_state.prefer_formatted_text != current_state.prefer_formatted_text) + initial_state.prefer_formatted_text != current_state.prefer_formatted_text || + (current_state.default_account && + (!initial_state.default_account || + strcmp (current_state.default_account, initial_state.default_account)!= 0))) return TRUE; else return FALSE;