* add checks that session != NULL

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index d93da11..9d46e75 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -252,7 +252,6 @@ account_list_disconnect (GSList *accounts)
 {
        GSList *cursor = accounts;
 
-       g_printerr ("modest: DEBUG disconnecting all accounts\n");
        while (cursor) {
                if (TNY_IS_CAMEL_ACCOUNT(cursor->data))  /* check twice... */
                        tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(cursor->data), FALSE, NULL);
@@ -563,7 +562,9 @@ modest_tny_account_store_finalize (GObject *obj)
        }
 
        /* disconnect all accounts when we are destroyed */
+       g_debug ("modest: disconnecting all store accounts");
        account_list_disconnect (priv->store_accounts);
+       g_debug ("modest: disconnecting all transport accounts");
        account_list_disconnect (priv->transport_accounts);
                
        /* this includes the local folder */
@@ -599,17 +600,14 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device)
        priv->device = g_object_ref (device);
        
        priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
+       if (!priv->session) {
+               g_warning ("failed to get TnySessionCamel");
+               return NULL;
+       }
        
        tny_session_camel_set_ui_locker (priv->session,  tny_gtk_lockable_new ());
-       /* FIXME: unref this in the end? */
        tny_session_camel_set_async_connecting (priv->session, TRUE);
-       
-       /* force a cache fill... ugly */
-       /* list = TNY_LIST(tny_simple_list_new()); */
-/*     tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, */
-/*                                     TNY_ACCOUNT_STORE_BOTH); */
-/*     g_object_unref(list); */
-       
+               
        /* Connect signals */
        g_signal_connect (G_OBJECT(account_mgr), "account_changed",
                                       G_CALLBACK (on_account_changed), obj);