* 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 14be515..3d70bb0 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -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 =