Reverting to revision 5189, using the latest debian/changelog file.

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 1db79ca..4b8d3cf 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -572,7 +572,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
        /* Get a reference to myself */
        self = MODEST_TNY_ACCOUNT_STORE (g_object_get_data (G_OBJECT(account), "account_store"));
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
+
        /* Ensure that we still have this account. It could happen
           that a set_online was requested *before* removing an
           account, and due to tinymail emits the get_password
@@ -860,6 +860,8 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->session = NULL;
        }
 
+       camel_shutdown ();
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -1069,7 +1071,7 @@ modest_tny_account_store_alert (TnyAccountStore *self,
                MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; 
        const gchar* server_name = "";
        gchar *prompt = NULL;
-       gboolean retval = TRUE;
+       gboolean retval;
 
        /* NOTE: account may be NULL in some cases */
        g_return_val_if_fail (error, FALSE);
@@ -1158,7 +1160,7 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
                retval = modest_platform_run_certificate_confirmation_dialog (server_name,
                                                                              error->message);
-       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
+       else {
                modest_platform_run_information_dialog (NULL, prompt, TRUE);
 
                /* Show the account dialog if it was wrong */
@@ -1169,7 +1171,6 @@ modest_tny_account_store_alert (TnyAccountStore *self,
                retval = TRUE;
        }
 
-       g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message);
        
        if (prompt)
                g_free (prompt);
@@ -2152,7 +2153,7 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou
 
 GtkWidget *
 modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self,
-                                                      const gchar *account_name)
+                                                     const gchar *account_name)
 {
        ModestTnyAccountStorePrivate *priv;
        gpointer dialog_as_gpointer = NULL;
@@ -2170,6 +2171,7 @@ modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *se
                GtkWidget *dialog;
                dialog = (GtkWidget *) modest_account_settings_dialog_new ();
                settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name);
+               modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
                modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings);
                g_object_unref (settings);
                modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));