Fix incorrect call to g_slice_free()

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 8bdbe6d..54f7e17 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -614,7 +614,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
        g_return_val_if_fail (account, NULL);
        
        MODEST_DEBUG_BLOCK(
-               g_debug ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+               g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
        );
        
        /* Initialize the output parameter: */
@@ -647,7 +647,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                                      NULL,
                                                      (gpointer*)&pwd_ptr);
        MODEST_DEBUG_BLOCK(
-               g_debug ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked);
+               g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked);
        );
                
        /* If the password is not already there, try ModestConf */
@@ -666,7 +666,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                const gboolean settings_have_password = 
                        modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
                MODEST_DEBUG_BLOCK(
-                       printf ("DEBUG: modest: %s: settings_have_password=%d\n",
+                       printf ("%s: settings_have_password=%d\n",
                                __FUNCTION__, settings_have_password);
                );
                if (settings_have_password) {
@@ -763,7 +763,6 @@ modest_tny_account_store_forget_already_asked (ModestTnyAccountStore *self, TnyA
 static void
 forget_password (TnyAccount *account)
 {
-       printf ("DEBUG: %s\n", __FUNCTION__);
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        const TnyAccountStore *account_store;
@@ -1204,6 +1203,8 @@ get_tny_account_by (TnyList *accounts,
        gboolean found = FALSE;
        TnyAccount *retval = NULL;
 
+       g_return_val_if_fail (accounts && TNY_IS_LIST(accounts), NULL);
+
        iter = tny_list_create_iterator (accounts);
        while (!tny_iterator_is_done (iter) && !found) {
                TnyAccount *tmp_account = NULL;
@@ -1340,14 +1341,16 @@ TnyAccount*
 modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
                                                                                  const gchar *account_name)
 {
+       TnyDevice *device;
+
+       g_return_val_if_fail (self && MODEST_IS_TNY_ACCOUNT_STORE(self), NULL);
+       g_return_val_if_fail (account_name, NULL);
+
        /* Get the current connection: */
-       TnyDevice *device = modest_runtime_get_device ();
+       device = modest_runtime_get_device ();
        
        if (!tny_device_is_online (device))
                return NULL;
-
-       g_return_val_if_fail (self, NULL);
-       
        
 #ifdef MODEST_HAVE_CONIC
        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL);
@@ -1676,7 +1679,8 @@ on_account_disconnect_when_removing (TnyCamelAccount *account,
 }
 
 static void
-on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account,
+on_account_removed (ModestAccountMgr *acc_mgr, 
+                   const gchar *account,
                    gpointer user_data)
 {
        TnyAccount *store_account = NULL, *transport_account = NULL;