X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=b48cdad6c744f8e76cb1b006c2ea3899a7b5888f;hp=3384d0532f13f65763f3c5ad8fe8de52c3d456b2;hb=30ec701bc2d1c270022e3543994f0221f6fb8b8c;hpb=ea8583a4daa59e30b1b0a7d22259c3183aab34f4 diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 3384d05..b48cdad 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -34,6 +34,7 @@ #include #include +#include "modest-platform.h" #include #include #include "modest-tny-platform-factory.h" @@ -128,23 +129,15 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self) GtkTreeModel *model; GtkTreeIter iter; gboolean has_selection; - gchar *account_name; - gchar *default_account_name; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); has_selection = gtk_tree_selection_get_selected (sel, &model, &iter); + /* Set the status of the buttons */ gtk_widget_set_sensitive (priv->edit_button, has_selection); gtk_widget_set_sensitive (priv->delete_button, has_selection); - - account_name = modest_account_view_get_selected_account (priv->account_view); - default_account_name = modest_account_mgr_get_default_account( - modest_runtime_get_account_mgr()); - - g_free (account_name); - g_free (default_account_name); } /** Check whether any connections are active, and cancel them if @@ -172,7 +165,7 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na transport_account = modest_tny_account_store_get_server_account (acc_store, account_name, - TNY_ACCOUNT_TYPE_STORE); + TNY_ACCOUNT_TYPE_TRANSPORT); store_conn_status = tny_account_get_connection_status (store_account); transport_conn_status = tny_account_get_connection_status (transport_account); @@ -190,6 +183,18 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na if (response == GTK_RESPONSE_OK) { /* FIXME: We should only cancel those of this account */ modest_mail_operation_queue_cancel_all (queue); + + /* Also disconnect the account */ + if (tny_account_get_connection_status (store_account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_account_cancel (store_account); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), + FALSE, NULL, NULL); + } + if (tny_account_get_connection_status (transport_account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_account_cancel (transport_account); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), + FALSE, NULL, NULL); + } retval = TRUE; } else { retval = FALSE; @@ -223,6 +228,8 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) if (check_for_active_account (self, account_name)) { /* The warning text depends on the account type: */ gchar *txt = NULL; + gint response; + if (modest_account_mgr_get_store_protocol (account_mgr, account_name) == MODEST_PROTOCOL_STORE_POP) { txt = g_strdup_printf (_("emev_nc_delete_mailbox"), @@ -239,10 +246,14 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) g_free (txt); txt = NULL; - if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { + response = gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); + while (gtk_events_pending ()) + gtk_main_iteration (); + + if (response == GTK_RESPONSE_OK) { /* Remove account. If it succeeds then it also removes - the account from the ModestAccountView: */ - + 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)) @@ -254,18 +265,45 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__); } } - gtk_widget_destroy (GTK_WIDGET (dialog)); g_free (account_title); - } - + } g_free (account_name); } } static void +on_account_settings_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + TnyAccount *store_account = NULL; + gchar* account_name = NULL; + ModestAccountViewWindowPrivate *priv = NULL; + + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data); + account_name = modest_account_view_get_selected_account (priv->account_view); + store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + account_name, + TNY_ACCOUNT_TYPE_STORE); + + /* Reconnect the store account, no need to reconnect the + transport account because it will connect when needed */ + if (tny_account_get_connection_status (store_account) == + TNY_CONNECTION_STATUS_DISCONNECTED) + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), + TRUE, NULL, NULL); + + /* Disconnect this handler */ + g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data); + + /* Free */ + g_free (account_name); +} + +static void on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self); gchar* account_name = modest_account_view_get_selected_account (priv->account_view); if (!account_name) @@ -280,7 +318,13 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); modest_account_settings_dialog_set_account_name (dialog, account_name); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); + + /* When the dialog is closed, reconnect */ + g_signal_connect (dialog, "response", + G_CALLBACK (on_account_settings_dialog_response), + self); + modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog)); } @@ -292,34 +336,35 @@ on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data) { /* The response has already been handled by the wizard dialog itself, * creating the new account. - */ - + */ /* Destroy the dialog: */ - if (dialog) { + if (dialog) gtk_widget_destroy (GTK_WIDGET (dialog)); - modest_window_mgr_set_easysetup_dialog ( - modest_runtime_get_window_mgr(), NULL); - } } static void on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { GtkDialog *wizard; + GtkWindow *dialog; /* Show the easy-setup wizard: */ - wizard = modest_window_mgr_get_easysetup_dialog (modest_runtime_get_window_mgr()); - if (wizard) { + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); + if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) { /* old wizard is active already; */ - gtk_window_present (GTK_WINDOW(wizard)); + gtk_window_present (dialog); return; - } else { - /* there is no such wizard yet */ - wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ()); - modest_window_mgr_set_easysetup_dialog (modest_runtime_get_window_mgr(), - GTK_DIALOG(wizard)); - } + } + + /* there is no such wizard yet */ + wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ()); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), + GTK_WINDOW (wizard)); + + /* if there is already another modal dialog, make it non-modal */ + if (dialog) + gtk_window_set_modal (GTK_WINDOW(dialog), FALSE); gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self)); @@ -380,7 +425,6 @@ button_box_new (ModestAccountViewWindow *self) return button_box; } - static GtkWidget* window_vbox_new (ModestAccountViewWindow *self) { @@ -390,6 +434,7 @@ window_vbox_new (ModestAccountViewWindow *self) GtkWidget *main_hbox = gtk_hbox_new (FALSE, 6); priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr()); + gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400); gtk_widget_show (GTK_WIDGET (priv->account_view)); @@ -417,9 +462,6 @@ window_vbox_new (ModestAccountViewWindow *self) static void modest_account_view_window_init (ModestAccountViewWindow *obj) { -/* - ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); -*/ gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)), TRUE, TRUE, 2); @@ -427,8 +469,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj) TRUE, TRUE, 2); gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts")); -} +} GtkWidget* modest_account_view_window_new (void)