Merged fix for bug 87257 from trunk

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 1870d53..bed758f 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -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;
+       gboolean retval = TRUE;
 
        /* NOTE: account may be NULL in some cases */
        g_return_val_if_fail (error, FALSE);