* in account_exists, the get_server_account_keyname and get_account_keyname were...

pmo-trunk-r204

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index e22063a..ceefe44 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -376,7 +376,7 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
 
        accounts = modest_conf_list_subkeys (priv->modest_conf,
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
 
        accounts = modest_conf_list_subkeys (priv->modest_conf,

-                                            MODEST_ACCOUNT_NAMESPACE, err);
+                                             MODEST_ACCOUNT_NAMESPACE, err);

        return strip_prefix_from_elements (accounts, prefix_len);
 }
 
        return strip_prefix_from_elements (accounts, prefix_len);
 }
 

@@ -666,17 +666,19 @@ account_exists (ModestAccountMgr * self, const gchar * name,
        gchar *keyname;
        gboolean retval;
 
        gchar *keyname;
        gboolean retval;
 

+        g_message("Da simmer dabei, dat is ");

        g_return_val_if_fail (self, FALSE);
        g_return_val_if_fail (self, FALSE);

-       g_return_val_if_fail (name, FALSE);
+        g_return_val_if_fail (name, FALSE);

 
        if (server_account)
 
        if (server_account)

-               keyname = get_account_keyname (name, NULL);
-       else

                keyname = get_server_account_keyname (name, NULL);
                keyname = get_server_account_keyname (name, NULL);

+       else
+               keyname = get_account_keyname (name, NULL);

 
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
        retval = modest_conf_key_exists (priv->modest_conf, keyname, err);
 
 
        priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
        retval = modest_conf_key_exists (priv->modest_conf, keyname, err);
 

+        g_message("prihima, prima Colonia: %s, %d", keyname, retval);

        g_free (keyname);
        return retval;
 }
        g_free (keyname);
        return retval;
 }