X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=e77b3357a86da5b549562d25468053eb92eaf3c2;hp=0307e4e70e96690414d095f368ac3bd1273d137c;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=6ebf456ad9d34d07c36667fa1e05118076d5dc38 diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 0307e4e..e77b335 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -39,6 +39,7 @@ #include "modest-tny-platform-factory.h" #include "maemo/easysetup/modest-easysetup-wizard.h" #include "maemo/modest-account-settings-dialog.h" +#include #include "widgets/modest-ui-constants.h" /* 'private'/'protected' functions */ @@ -60,6 +61,9 @@ struct _ModestAccountViewWindowPrivate { GtkWidget *delete_button; GtkWidget *close_button; ModestAccountView *account_view; + + /* We remember this so that we only open one at a time: */ + ModestEasysetupWizardDialog *wizard; }; #define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \ @@ -116,6 +120,13 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass) static void modest_account_view_window_finalize (GObject *obj) { + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); + + if (priv->wizard) { + gtk_widget_destroy (GTK_WIDGET (priv->wizard)); + priv->wizard = NULL; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -160,37 +171,29 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) if(!account_name) return; - gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); - if (account_name) { - gboolean removed; - GtkWidget *dialog; - gchar *txt; - - /* Freeze updates, so we can do just one update afterwards, - * instead of responding to every conf key change: */ - modest_account_view_block_conf_updates (priv->account_view); + gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); - dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"), - GTK_WINDOW (self), - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); - /* TODO: This confirmation dialog is not specified in the Maemo UI spec, - * but we really need one: */ - txt = g_strdup_printf (_("Do you really want to delete the account %s?"), - account_title); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), - gtk_label_new (txt), FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + /* The warning text depends on the account type: */ + gchar *txt = NULL; + if (modest_account_mgr_get_store_protocol (account_mgr, account_name) + == MODEST_PROTOCOL_STORE_POP) { + txt = g_strdup_printf (_("emev_nc_delete_mailbox"), + account_title); + } else { + txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), + account_title); + } + + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), + txt)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); g_free (txt); + txt = NULL; - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - /* Remove account. If succeeded it removes also - the account from the ModestAccountView */ + if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { + /* Remove account. If it succeeds then it also removes + the account from the ModestAccountView: */ gboolean is_default = FALSE; gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr); @@ -198,28 +201,14 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) is_default = TRUE; g_free (default_account_name); - removed = modest_account_mgr_remove_account (account_mgr, - account_name, - FALSE); - - if (removed && is_default) { - /* Set a different account as the default, so there is always at least one default: - * This is not specified, and might be the wrong behaviour. murrayc. */ - modest_account_mgr_set_first_account_as_default (account_mgr); - } - - if (removed) { - /* Show confirmation dialog ??? */ - } else { - /* Show error dialog ??? */ + gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name); + if (!removed) { + g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__); } } - gtk_widget_destroy (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); g_free (account_title); g_free (account_name); - - /* Update the view: */ - modest_account_view_unblock_conf_updates (priv->account_view); } } @@ -232,22 +221,48 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) if (!account_name) return; - /* Freeze updates, so we can do just one update afterwards, - * instead of responding to every conf key change: */ - modest_account_view_block_conf_updates (priv->account_view); + /* Check whether any connections are active, and cancel them if + * the user wishes. + */ + ModestAccountMgr* mgr = modest_runtime_get_account_mgr (); + ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue(); + if (modest_account_mgr_account_is_busy(mgr, account_name)) { + GtkWidget *note = hildon_note_new_confirmation (GTK_WINDOW (self), + _("emev_nc_disconnect_account")); + const int response = gtk_dialog_run (GTK_DIALOG(note)); + gtk_widget_destroy (note); + if (response == GTK_RESPONSE_OK) { + /* FIXME: We should only cancel those of this account */ + modest_mail_operation_queue_cancel_all(queue); + } + else + return; + } /* Show the Account Settings window: */ ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); modest_account_settings_dialog_set_account_name (dialog, account_name); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog)); g_free (account_name); +} + +static void +on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data) +{ + ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data); + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - /* Update the view: */ - modest_account_view_unblock_conf_updates (priv->account_view); + /* The response has already been handled by the wizard dialog itself, + * creating the new account. + */ + + /* Destroy the dialog: */ + if (priv->wizard) { + gtk_widget_destroy (GTK_WIDGET (priv->wizard)); + priv->wizard = NULL; + } } static void @@ -255,18 +270,21 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - /* Freeze updates, so we can do just one update afterwards, - * instead of responding to every conf key change: */ - modest_account_view_block_conf_updates (priv->account_view); - /* Show the easy-setup wizard: */ - ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new (); - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self)); - gtk_dialog_run (GTK_DIALOG (wizard)); - gtk_widget_destroy (GTK_WIDGET (wizard)); - /* Allow updates: */ - modest_account_view_unblock_conf_updates (priv->account_view); + if (priv->wizard) { + /* Just show the existing window: */ + gtk_window_present (GTK_WINDOW (priv->wizard)); + } else { + /* Create and show the dialog: */ + priv->wizard = modest_easysetup_wizard_dialog_new (); + + gtk_window_set_transient_for (GTK_WINDOW (priv->wizard), GTK_WINDOW (self)); + + /* Destroy the dialog when it is closed: */ + g_signal_connect (G_OBJECT (priv->wizard), "response", G_CALLBACK (on_wizard_response), self); + gtk_widget_show (GTK_WIDGET (priv->wizard)); + } } @@ -365,6 +383,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj) gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), TRUE, TRUE, 2); + + gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts")); }