* bug fixes for editor window usage

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 5373c30..dcceba2 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -339,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);
@@ -352,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,
@@ -390,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) {
@@ -413,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);
@@ -447,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);
@@ -518,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"),
@@ -533,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;
 }