* src/modest-tny-account-store.c:

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 2dd83d0..5e9bb8d 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -853,6 +853,8 @@ modest_tny_account_store_finalize (GObject *obj)
                camel_object_unref (CAMEL_OBJECT(priv->session));
                priv->session = NULL;
        }
+
+       camel_shutdown ();
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -1063,7 +1065,7 @@ modest_tny_account_store_alert (TnyAccountStore *self,
                                TnyAccount *account, 
                                TnyAlertType type,
                                gboolean question, 
-                               const GError *error)
+                               GError *error)
 {
        ModestTransportStoreProtocol proto =
                MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; 
@@ -1163,15 +1165,15 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data)
 
        klass = (TnyAccountStoreIface *)g;
 
-       klass->get_accounts_func =
+       klass->get_accounts =
                modest_tny_account_store_get_accounts;
-       klass->get_cache_dir_func =
+       klass->get_cache_dir =
                modest_tny_account_store_get_cache_dir;
-       klass->get_device_func =
+       klass->get_device =
                modest_tny_account_store_get_device;
-       klass->alert_func =
+       klass->alert =
                modest_tny_account_store_alert;
-       klass->find_account_func =
+       klass->find_account =
                modest_tny_account_store_find_account_by_url;
 }
 
@@ -1332,6 +1334,7 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
                g_object_unref (tmp_account);
                tny_iterator_next (iter);
        }
+       g_object_unref (iter);
 
        if (!found) {
                g_printerr ("modest: %s: could not get tny %s account for %s\n." \
@@ -1851,6 +1854,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self,
                        g_object_unref (folder);
                        tny_iterator_next (folders_iter);
                }
+               g_object_unref (folders_iter);
 
                g_object_unref (folders);
                g_object_unref (account);