* Fix some detected memory leaks

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 39f6b78..3d70bb0 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -36,10 +36,10 @@
 #include <tny-transport-account.h>
 #include <tny-simple-list.h>
 #include <tny-account-store.h>
-#include <tny-maemo-conic-device.h> /* For ConIcIap */
 #include <tny-camel-transport-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
+
 #include <modest-runtime.h>
 #include <modest-marshal.h>
 #include <modest-protocol-info.h>
@@ -53,6 +53,10 @@
 #include <tny-gtk-lockable.h>
 #include <camel/camel.h>
 
+#ifdef MODEST_PLATFORM_MAEMO
+#include <tny-maemo-conic-device.h>
+#endif
+
 /* 'private'/'protected' functions */
 static void modest_tny_account_store_class_init   (ModestTnyAccountStoreClass *klass);
 //static void modest_tny_account_store_init         (ModestTnyAccountStore *obj);
@@ -182,14 +186,11 @@ account_list_free (GSList *accounts)
        GSList *cursor = accounts;
 
        while (cursor) {
-               /* TODO: This uses cursor->data after causing it to be freed,
-                * as valgrind shows.
-                * It's not clear what is being attempted here. murrayc */
-               g_object_unref (G_OBJECT(cursor->data));
                if (G_IS_OBJECT(cursor->data)) { /* check twice... */
                        const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data));
-                       modest_runtime_verify_object_death(cursor->data,id);
+                       modest_runtime_verify_object_last_ref(cursor->data,id);
                }                       
+               g_object_unref (G_OBJECT(cursor->data));
                cursor = cursor->next;
        }
        g_slist_free (accounts);
@@ -379,7 +380,6 @@ modest_tny_account_store_finalize (GObject *obj)
 
        if (priv->session) {
                camel_object_unref (CAMEL_OBJECT(priv->session));
-               modest_runtime_verify_object_death(priv->session, "");
                priv->session = NULL;
        }
        
@@ -449,13 +449,14 @@ get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
 static GSList*
 get_accounts  (TnyAccountStore *self, TnyList *list, TnyAccountType type)
 {
-       ModestTnyAccountStorePrivate *priv;
-       GSList                       *account_names, *cursor;
+       ModestTnyAccountStorePrivate *priv = NULL;
+       GSList                       *account_names = NULL, *cursor = NULL;
        GSList                       *accounts = NULL;
        
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
  
-       account_names = modest_account_mgr_account_names (priv->account_mgr);
+       account_names = modest_account_mgr_account_names (priv->account_mgr, 
+               TRUE /* including disabled accounts */);
        
        for (cursor = account_names; cursor; cursor = cursor->next) {
                
@@ -633,26 +634,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
 }
 
 
-
-static void
-modest_tny_account_store_add_store_account  (TnyAccountStore *self,
-                                            TnyStoreAccount *account)
-{
-       /* we should not need this...*/
-       g_printerr ("modest: add_store_account_func not implemented\n");
-}
-
-
-static void
-modest_tny_account_store_add_transport_account  (TnyAccountStore *self,
-                                                TnyTransportAccount *account)
-{      
-       /* we should not need this...*/
-       g_printerr ("modest: add_transport_account_func not implemented\n");
-}
-
-
-
 static void
 modest_tny_account_store_init (gpointer g, gpointer iface_data)
 {
@@ -664,10 +645,6 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data)
 
        klass->get_accounts_func =
                modest_tny_account_store_get_accounts;
-       klass->add_transport_account_func =
-               modest_tny_account_store_add_transport_account;
-       klass->add_store_account_func =
-               modest_tny_account_store_add_store_account;
        klass->get_cache_dir_func =
                modest_tny_account_store_get_cache_dir;
        klass->get_device_func =
@@ -780,6 +757,7 @@ static TnyAccount* get_smtp_specific_transport_account_for_open_connection (Mode
        if (!tny_device_is_online (device))
                return NULL;
 
+#ifdef MODEST_PLATFORM_MAEMO
        g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
        TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);    
        const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
@@ -809,6 +787,9 @@ static TnyAccount* get_smtp_specific_transport_account_for_open_connection (Mode
        g_object_unref (connection);
        
        return account;
+#else
+       return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
+#endif /* MODEST_PLATFORM_MAEMO */
 }