* some cleanup in modest-ui-wizard and modest-ui

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 8e8f4dd..dcceba2 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -221,8 +221,6 @@ get_password (TnyAccountIface *account, const gchar *prompt)
        ModestTnyAccountStorePrivate *priv;
        gchar *val;
 
-        g_message (__FUNCTION__);
-
        g_return_val_if_fail (account, NULL);
 
        key = tny_account_iface_get_id (account);
@@ -341,7 +339,8 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                                             TNY_ACCOUNT_STORE_IFACE(self));
        /* id */
        tny_account_iface_set_id (tny_account, key);
-
+       tny_account_iface_set_name (tny_account, key);
+       
        /* proto */
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
                                                            MODEST_ACCOUNT_PROTO, NULL);
@@ -354,7 +353,6 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                return NULL;
        }
 
-
        /* hostname */
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
                                                            MODEST_ACCOUNT_HOSTNAME,
@@ -392,7 +390,6 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts
 
        while (cursor) {
                TnyAccountIface *tny_account;
-               gchar *key = cursor->data;
                tny_account = tny_account_from_key (self, (gchar*)cursor->data,
                                                    is_store);
                if (!tny_account) {
@@ -415,7 +412,7 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 {
        ModestTnyAccountStore        *self;
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
+       GSList                       *accounts;
        GList                        *tny_accounts;
 
        g_return_val_if_fail (iface, NULL);
@@ -429,12 +426,9 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
                                                         MODEST_PROTO_TYPE_STORE,
                                                         NULL, FALSE);
 
-       g_message ("accounts: %d", g_slist_length (accounts));
        tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
        g_slist_free (accounts);
-       g_message ("store accounts: %d", g_list_length (tny_accounts));
-
-
+       
        /*
         * FIXME: after gconf notification support is added,
         * we can simply return priv->store_account
@@ -452,7 +446,7 @@ modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
 {
        ModestTnyAccountStore        *self;
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
+       GSList                       *accounts;
        GList                        *tny_accounts;
 
        g_return_val_if_fail (iface, NULL);
@@ -502,9 +496,6 @@ tny_account_store_get_session (TnyAccountStore *self)
 
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       g_message ("returning tny session camel %p",
-                  priv->tny_session_camel);
-
        return priv->tny_session_camel;
 }
 
@@ -526,8 +517,6 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
        ModestTnyAccountStorePrivate *priv;
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       gchar *cache_dir;
-
        if (!priv->cache_dir) {
                if (g_getenv("HOME") != NULL)
                        priv->cache_dir = g_strconcat(g_getenv("HOME"),
@@ -541,7 +530,9 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
 static const TnyDeviceIface*
 modest_tny_account_store_get_device (TnyAccountStoreIface *self)
 {
-       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
 
        return priv->device;
 }