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);
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,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
NULL);
txt = g_strdup_printf (_("emev_nc_delete_mailboximap"),
account_title);
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 {
gtk_widget_destroy (dialog);
g_free (account_title);
g_free (account_name);
-
- /* Update the view: */
- modest_account_view_unblock_conf_updates (priv->account_view);
}
}
/* Check whether any connections are active, and cancel them if
* the user wishes.
- * TODO: Check only for connections with this account, instead of all.
- * Maybe we need a queue per account.
*/
- ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue ();
- if (modest_mail_operation_queue_num_elements(queue)) {
+ 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) {
- modest_mail_operation_queue_cancel_all(queue);;
+ /* FIXME: We should only cancel those of this account */
+ modest_mail_operation_queue_cancel_all(queue);
}
else
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);
-
/* Show the Account Settings window: */
ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
modest_account_settings_dialog_set_account_name (dialog, account_name);
gtk_widget_destroy (GTK_WIDGET (dialog));
g_free (account_name);
-
- /* Update the view: */
- modest_account_view_unblock_conf_updates (priv->account_view);
-
- /* TODO: Call modest_account_view_select_account() when
- * the view has actually been update. */
}
static void
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);
}
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"));
}