* more implementation on message viewer

[modest] / src / modest-account-mgr.c

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index 3ea2ed6..1eb0d6c 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -130,7 +130,6 @@ modest_account_mgr_add_account (ModestAccountMgr * self, const gchar * name,
 {
        ModestAccountMgrPrivate *priv;
        gchar *key;
-       gboolean retval;
 
        g_return_val_if_fail (self, FALSE);
        g_return_val_if_fail (name, FALSE);
@@ -264,7 +263,7 @@ modest_account_mgr_remove_server_account (ModestAccountMgr * self,
                                          const gchar * name, GError ** err)
 {
        ModestAccountMgrPrivate *priv;
-       gchar *acckey, *key;
+       gchar *acckey;
        gboolean retval;
 
        g_return_val_if_fail (self, FALSE);
@@ -367,7 +366,7 @@ modest_account_mgr_server_account_names (ModestAccountMgr * self,
 GSList *
 modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
 {
-       GSList *accounts, *cursor;
+       GSList *accounts;
        ModestAccountMgrPrivate *priv;
        const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/");
 
@@ -377,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,
-                                            MODEST_ACCOUNT_NAMESPACE, err);
+                                             MODEST_ACCOUNT_NAMESPACE, err);
        return strip_prefix_from_elements (accounts, prefix_len);
 }
 
@@ -668,12 +667,12 @@ account_exists (ModestAccountMgr * self, const gchar * name,
        gboolean retval;
 
        g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (name, FALSE);
+        g_return_val_if_fail (name, FALSE);
 
        if (server_account)
-               keyname = get_account_keyname (name, NULL);
-       else
                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);