X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=6698fc367eeb9c24773a0673d6dbffb5f9d25b6b;hp=3384d0532f13f65763f3c5ad8fe8de52c3d456b2;hb=f541209a85cb6c71c79da1df81afbe10c448690a;hpb=ea8583a4daa59e30b1b0a7d22259c3183aab34f4 diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 3384d05..6698fc3 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -34,12 +34,13 @@ #include #include +#include "modest-platform.h" #include #include #include "modest-tny-platform-factory.h" -#include "maemo/easysetup/modest-easysetup-wizard.h" -#include "maemo/modest-account-settings-dialog.h" -#include +#include "easysetup/modest-easysetup-wizard-dialog.h" +#include "modest-account-settings-dialog.h" +#include #include "widgets/modest-ui-constants.h" /* 'private'/'protected' functions */ @@ -61,6 +62,7 @@ struct _ModestAccountViewWindowPrivate { GtkWidget *delete_button; GtkWidget *close_button; ModestAccountView *account_view; + guint acc_removed_handler; }; #define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \ @@ -105,19 +107,22 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass) gobject_class->finalize = modest_account_view_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestAccountViewWindowPrivate)); - - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ } static void -modest_account_view_window_finalize (GObject *obj) +modest_account_view_window_finalize (GObject *self) { - G_OBJECT_CLASS(parent_class)->finalize (obj); + ModestAccountViewWindowPrivate *priv; + ModestAccountMgr *mgr; + + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self); + mgr = modest_runtime_get_account_mgr (); + + if (g_signal_handler_is_connected (mgr, priv->acc_removed_handler)) + g_signal_handler_disconnect (mgr, priv->acc_removed_handler); + priv->acc_removed_handler = 0; + + G_OBJECT_CLASS(parent_class)->finalize (self); } @@ -128,23 +133,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); + gtk_widget_set_sensitive (priv->delete_button, has_selection); } /** Check whether any connections are active, and cancel them if @@ -156,11 +153,12 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self) static gboolean check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name) { + ModestTnySendQueue *send_queue; ModestTnyAccountStore *acc_store; ModestMailOperationQueue* queue; - TnyConnectionStatus store_conn_status, transport_conn_status; + TnyConnectionStatus store_conn_status; TnyAccount *store_account = NULL, *transport_account = NULL; - gboolean retval = TRUE; + gboolean retval = TRUE, sending = FALSE; acc_store = modest_runtime_get_account_store (); queue = modest_runtime_get_mail_operation_queue (); @@ -169,33 +167,60 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na modest_tny_account_store_get_server_account (acc_store, account_name, TNY_ACCOUNT_TYPE_STORE); + + /* This could happen if the account was deleted before the + call to this function */ + if (!store_account) + return FALSE; + 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); + /* This could happen if the account was deleted before the + call to this function */ + if (!transport_account) { + g_object_unref (store_account); + return FALSE; + } - if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || - transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) { - GtkWidget *note = NULL; - gint response; + /* If the transport account was not used yet, then the send + queue could not exist (it's created on demand) */ + send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE); + if (TNY_IS_SEND_QUEUE (send_queue)) + sending = modest_tny_send_queue_sending_in_progress (send_queue); - note = hildon_note_new_confirmation (GTK_WINDOW (self), - _("emev_nc_disconnect_account")); - response = gtk_dialog_run (GTK_DIALOG(note)); + store_conn_status = tny_account_get_connection_status (store_account); + if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) { + gint response; - gtk_widget_destroy (note); + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), + _("emev_nc_disconnect_account")); if (response == GTK_RESPONSE_OK) { - /* FIXME: We should only cancel those of this account */ - modest_mail_operation_queue_cancel_all (queue); retval = TRUE; } else { retval = FALSE; } } + if (retval) { + + /* 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_DISCONNECTED) && + (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) { + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), + FALSE, NULL, NULL); + } + if (sending) { + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), + FALSE, NULL, NULL); + } + } + /* Frees */ g_object_unref (store_account); g_object_unref (transport_account); @@ -208,64 +233,91 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; ModestAccountMgr *account_mgr; - + gchar *account_title = NULL, *account_name = NULL; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); account_mgr = modest_runtime_get_account_mgr(); - gchar *account_name = modest_account_view_get_selected_account (priv->account_view); + account_name = modest_account_view_get_selected_account (priv->account_view); if(!account_name) return; + + account_title = modest_account_mgr_get_display_name(account_mgr, account_name); + /* This could happen if the account is being deleted */ + if (!account_title) + return; + + if (check_for_active_account (self, account_name)) { + /* The warning text depends on the account type: */ + gchar *txt = NULL; + gint response; - if (account_name) { - gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name); - - if (check_for_active_account (self, 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) { + 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); - } + account_title); + } else { + txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), + account_title); + } + + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt); + g_free (txt); + txt = NULL; + + if (response == 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); - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), - txt)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); - g_free (txt); - txt = NULL; - - 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); if (!removed) { 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); - } + 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) @@ -275,30 +327,33 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) * the user wishes. */ if (check_for_active_account (self, account_name)) { + GtkWidget *dialog = modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name); - /* 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_modal (GTK_WINDOW (dialog), TRUE); - modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog)); + /* When the dialog is closed, reconnect */ + g_signal_connect (dialog, "response", + G_CALLBACK (on_account_settings_dialog_response), + self); } g_free (account_name); } static void -on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data) +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); + + /* Re-focus the account list view widget */ + if (MODEST_IS_ACCOUNT_VIEW_WINDOW (user_data)) { + ModestAccountViewWindowPrivate *priv; + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data); + gtk_widget_grab_focus (GTK_WIDGET (priv->account_view)); } } @@ -306,20 +361,25 @@ 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)); @@ -338,8 +398,6 @@ on_close_button_clicked (GtkWidget *button, gpointer user_data) gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK); } - - static GtkWidget* button_box_new (ModestAccountViewWindow *self) { @@ -367,20 +425,26 @@ button_box_new (ModestAccountViewWindow *self) g_signal_connect (G_OBJECT(priv->close_button), "clicked", G_CALLBACK(on_close_button_clicked), self); - + gtk_box_pack_start (GTK_BOX(button_box), priv->new_button, FALSE, FALSE,2); gtk_box_pack_start (GTK_BOX(button_box), priv->edit_button, FALSE, FALSE,2); gtk_box_pack_start (GTK_BOX(button_box), priv->delete_button, FALSE, FALSE,2); gtk_box_pack_start (GTK_BOX(button_box), priv->close_button, FALSE, FALSE,2); - gtk_widget_set_sensitive (priv->edit_button, FALSE); - gtk_widget_set_sensitive (priv->delete_button, FALSE); + /* Should has been created by window_vbox_new */ + if (priv->account_view) { + GtkTreeSelection *sel; + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view)); + if (gtk_tree_selection_count_selected_rows (sel) == 0) { + gtk_widget_set_sensitive (priv->edit_button, FALSE); + gtk_widget_set_sensitive (priv->delete_button, FALSE); + } + } gtk_widget_show_all (button_box); return button_box; } - static GtkWidget* window_vbox_new (ModestAccountViewWindow *self) { @@ -390,7 +454,10 @@ 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); + + /* Only force the height, the width of the widget will depend + on the size of the column titles */ + gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400); gtk_widget_show (GTK_WIDGET (priv->account_view)); GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view)); @@ -415,25 +482,53 @@ window_vbox_new (ModestAccountViewWindow *self) static void -modest_account_view_window_init (ModestAccountViewWindow *obj) +modest_account_view_window_init (ModestAccountViewWindow *self) { -/* - 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); - - gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), - TRUE, TRUE, 2); + ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts")); + priv->acc_removed_handler = 0; } +static void +on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, + gpointer user_data) +{ + ModestAccountViewWindowPrivate *priv; + + /* If there is no account left then close the window */ + if (!modest_account_mgr_has_accounts (acc_mgr, TRUE)) { + gboolean ret_value; + g_signal_emit_by_name (G_OBJECT (user_data), "delete-event", NULL, &ret_value); + } else { + /* Re-focus the account list view widget */ + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data); + gtk_widget_grab_focus (GTK_WIDGET (priv->account_view)); + } +} GtkWidget* modest_account_view_window_new (void) { - GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); + GObject *self = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); + ModestAccountViewWindowPrivate *priv; + ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr (); + + /* Add widgets */ + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->vbox)), + window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self)), + TRUE, TRUE, 2); + + gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->action_area)), + button_box_new (MODEST_ACCOUNT_VIEW_WINDOW (self)), + TRUE, TRUE, 2); + + gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup_accounts")); + + /* Connect signals */ + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); + priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed", + G_CALLBACK (on_account_removed), self); - return GTK_WIDGET(obj); + return GTK_WIDGET (self); }