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, \
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);
}
/* Set the status of the buttons */
gtk_widget_set_sensitive (priv->edit_button, has_selection);
- gtk_widget_set_sensitive (priv->delete_button, has_selection);
+ gtk_widget_set_sensitive (priv->delete_button, has_selection);
}
/** Check whether any connections are active, and cancel them if
TnyConnectionStatus store_conn_status, transport_conn_status;
TnyAccount *store_account = NULL, *transport_account = NULL;
gboolean retval = TRUE;
+ gboolean do_disconnect = TRUE;
acc_store = modest_runtime_get_account_store ();
queue = modest_runtime_get_mail_operation_queue ();
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_TRANSPORT);
+ /* This could happen if the account was deleted before the
+ call to this function */
+ if (!transport_account) {
+ g_object_unref (store_account);
+ return FALSE;
+ }
+
store_conn_status = tny_account_get_connection_status (store_account);
transport_conn_status = tny_account_get_connection_status (transport_account);
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self),
_("emev_nc_disconnect_account"));
+ do_disconnect = (response == FALSE);
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;
}
- }
+ }
+
+ if (do_disconnect) {
+
+ /* 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_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_DISCONNECTED) &&
+ (tny_account_get_connection_status (transport_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
+ tny_account_cancel (transport_account);
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+ FALSE, NULL, NULL);
+ }
+ }
+
/* Frees */
g_object_unref (store_account);
g_object_unref (transport_account);
{
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;
-
- 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;
- gint response;
- if (modest_account_mgr_get_store_protocol (account_mgr, account_name)
- == MODEST_PROTOCOL_STORE_POP) {
+ 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 (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);
- 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);
-
gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name);
if (!removed) {
g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
}
- }
- g_free (account_title);
- }
- g_free (account_name);
- }
+
+ }
+ g_free (account_title);
+ }
+ g_free (account_name);
}
static void
}
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)
gtk_widget_destroy (GTK_WIDGET (dialog));
+
+ /* 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));
+ }
}
static void
{
GtkDialog *wizard;
GtkWindow *dialog;
-
+
/* Show the easy-setup wizard: */
dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
}
-
-
static GtkWidget*
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 void
-modest_account_view_window_init (ModestAccountViewWindow *obj)
+modest_account_view_window_init (ModestAccountViewWindow *self)
{
- 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);
+
+ priv->acc_removed_handler = 0;
+}
- gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
+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);
}
projects / modest / blobdiff