X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=6f08eecf8aa560f904e7b6064a373b561761e0c4;hp=ebf12620fc52b81b9a08d343237e3b285724157d;hb=47b04b1e03f3599c7c77b5040baf7ad58aa3802b;hpb=880082a320cf57a2a5ead4d7955394f7f99be65b diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index ebf1262..6f08eec 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -39,6 +39,8 @@ #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 */ static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass); @@ -150,45 +152,54 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; ModestAccountMgr *account_mgr; - gchar *account_name; + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); account_mgr = modest_runtime_get_account_mgr(); - account_name = modest_account_view_get_selected_account (priv->account_view); - + gchar *account_name = modest_account_view_get_selected_account (priv->account_view); + if(!account_name) + return; + if (account_name) { - gboolean removed; - GtkWidget *dialog; - gchar *txt; - - 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); - txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name); - 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)); + gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); + + /* 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 */ - removed = modest_account_mgr_remove_account (account_mgr, - account_name, - FALSE); - if (removed) { - /* Show confirmation dialog ??? */ - } else { - /* Show error dialog ??? */ + 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); + if (default_account_name && (strcmp (default_account_name, account_name) == 0)) + is_default = TRUE; + g_free (default_account_name); + + gboolean removed = modest_account_mgr_remove_account (account_mgr, + account_name, + FALSE); + 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); } } @@ -202,13 +213,29 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) if (!account_name) return; + /* 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); } @@ -245,9 +272,9 @@ button_box_new (ModestAccountViewWindow *self) GTK_BUTTONBOX_START); priv->new_button = gtk_button_new_from_stock(_("mcen_bd_new")); - priv->edit_button = gtk_button_new_with_label(_("mcen_bd_emailsetup_edit")); - priv->delete_button = gtk_button_new_from_stock(_("mcen_bd_emailsetup_delete")); - priv->close_button = gtk_button_new_from_stock(_("mcen_bd_emailsetup_close")); + priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit")); + priv->delete_button = gtk_button_new_from_stock(_("mcen_bd_delete")); + priv->close_button = gtk_button_new_from_stock(_("mcen_bd_close")); g_signal_connect (G_OBJECT(priv->new_button), "clicked", G_CALLBACK(on_new_button_clicked), @@ -292,6 +319,9 @@ window_vbox_new (ModestAccountViewWindow *self) self); GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view)); gtk_widget_show (GTK_WIDGET (scrolled_window)); @@ -316,6 +346,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")); }