* fixed get_account_keyname(), not adding MODEST_ACCOUNT_NAMESPACE to keys anymore

pmo-trunk-r42

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index f25c10f..4532bd7 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -675,10 +675,9 @@ get_account_keyname (const gchar *accname, const gchar *name)
 {
        if (name)
                return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);
+                       (accname, "/", name, NULL);
        else
-               return g_strconcat
-                       (MODEST_ACCOUNT_NAMESPACE, "/", accname, NULL);
+               return g_strdup (accname);
 }
 
 
@@ -686,6 +685,7 @@ get_account_keyname (const gchar *accname, const gchar *name)
 static gchar*
 get_server_account_keyname (const gchar *accname, const gchar *name)
 {
+       g_printf("get_server_account_keyname('%s', '%s')\n", accname, name);
        if (name)
                return g_strconcat
                        (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", accname, "/", name, NULL);

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 0238a7c..5538c71 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -324,7 +324,7 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 
        g_return_val_if_fail (iface, NULL);
 
-       g_warning ("i'm being called: %s", __FUNCTION__);
+       /* g_warning ("i'm being called: %s", __FUNCTION__); */
 
        self = MODEST_TNY_ACCOUNT_STORE(iface);
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);