X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=7f0ee82c97ae6ec284bfd09ed7c5ca437010f080;hp=f77e2470e3b86c2fb531ade135db86f67555703e;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=77821904968eef97ab06bf7abdc3599c985a18c6 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index f77e247..7f0ee82 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -721,6 +721,26 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, return TRUE; } +gboolean +modest_account_mgr_remove_server_account (ModestAccountMgr * self, + const gchar* name) +{ + ModestAccountMgrPrivate *priv; + + g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE); + g_return_val_if_fail (name, FALSE); + + if (!modest_account_mgr_account_exists (self, name, TRUE)) { + g_printerr ("modest: %s: server account '%s' does not exist\n", __FUNCTION__, name); + return FALSE; + } + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + real_remove_account (priv->modest_conf, name, TRUE); + + return TRUE; +} + /* strip the first /n/ character from each element @@ -746,7 +766,8 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled ModestAccountMgrPrivate *priv; GError *err = NULL; - const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/"); + /* we add 1 for the trailing "/" */ + const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE) + 1; g_return_val_if_fail (self, NULL); @@ -768,9 +789,11 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled /* Unescape the keys to get the account names: */ GSList *iter = accounts; while (iter) { - if (!(iter->data)) + if (!(iter->data)) { + iter = iter->next; continue; - + } + const gchar* account_name_key = (const gchar*)iter->data; gchar* unescaped_name = account_name_key ? modest_conf_key_unescape (account_name_key) @@ -936,7 +959,7 @@ modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name, const gchar *key, ModestConfValueType list_type, gboolean server_account) { - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + ModestAccountMgrPrivate *priv = NULL; const gchar *keyname; GSList *retval; @@ -1132,6 +1155,7 @@ modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, ModestAccountSettings *settings = modest_account_mgr_load_account_settings (self, account_name); if (!settings) { g_printerr ("modest: failed to get account data for %s\n", account_name); + cursor = cursor->next; continue; } @@ -1210,6 +1234,7 @@ modest_account_mgr_check_already_configured_account (ModestAccountMgr *self, from_mgr_settings = modest_account_mgr_load_account_settings (self, account_name); if (!settings) { g_printerr ("modest: failed to get account data for %s\n", account_name); + cursor = cursor->next; continue; } @@ -1266,6 +1291,11 @@ modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, gchar* _modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key, gboolean *is_server_account) { + const gchar* account_ns; + const gchar* server_account_ns; + gchar *account = NULL; + gchar *unescaped_name = NULL; + /* Initialize input parameters: */ if (is_account_key) *is_account_key = FALSE; @@ -1273,10 +1303,8 @@ _modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key if (is_server_account) *is_server_account = FALSE; - const gchar* account_ns = MODEST_ACCOUNT_NAMESPACE "/"; - const gchar* server_account_ns = MODEST_SERVER_ACCOUNT_NAMESPACE "/"; - gchar *cursor; - gchar *account = NULL; + account_ns = modest_defs_namespace (MODEST_ACCOUNT_SUBNAMESPACE "/"); + server_account_ns = modest_defs_namespace (MODEST_SERVER_ACCOUNT_SUBNAMESPACE "/"); /* determine whether it's an account or a server account, * based on the prefix */ @@ -1284,37 +1312,40 @@ _modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key if (is_server_account) *is_server_account = FALSE; - + account = g_strdup (key + strlen (account_ns)); } else if (g_str_has_prefix (key, server_account_ns)) { if (is_server_account) *is_server_account = TRUE; - - account = g_strdup (key + strlen (server_account_ns)); + + account = g_strdup (key + strlen (server_account_ns)); } else return NULL; - /* if there are any slashes left in the key, it's not - * the toplevel entry for an account - */ - cursor = strstr(account, "/"); - - if (is_account_key && cursor) - *is_account_key = TRUE; + if (account) { + gchar *cursor; + + /* if there are any slashes left in the key, it's not + * the toplevel entry for an account + */ + cursor = strstr(account, "/"); - /* put a NULL where the first slash was */ - if (cursor) - *cursor = '\0'; + if (cursor) { + if (is_account_key) + *is_account_key = TRUE; - if (account) { - /* The key is an escaped string, so unescape it to get the actual account name: */ - gchar *unescaped_name = modest_conf_key_unescape (account); + /* put a NULL where the first slash was */ + *cursor = '\0'; + } + + /* The key is an escaped string, so unescape it to get the actual account name */ + unescaped_name = modest_conf_key_unescape (account); g_free (account); - return unescaped_name; - } else - return NULL; + } + + return unescaped_name; } @@ -1345,7 +1376,7 @@ _modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar* gboolean server_account) { gchar *retval = NULL; - gchar *namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + gchar *namespace = server_account ? (gchar *) MODEST_SERVER_ACCOUNT_NAMESPACE : (gchar *) MODEST_ACCOUNT_NAMESPACE; gchar *escaped_account_name, *escaped_name; if (!account_name) @@ -1650,3 +1681,28 @@ modest_account_mgr_set_display_name (ModestAccountMgr *self, if (notify) g_signal_emit (self, signals[DISPLAY_NAME_CHANGED_SIGNAL], 0, account_name); } + +gboolean +modest_account_mgr_singleton_protocol_exists (ModestAccountMgr *mgr, + ModestProtocolType protocol_type) +{ + GSList *account_names, *node; + gboolean found = FALSE; + + g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR (mgr), FALSE); + account_names = modest_account_mgr_account_names (mgr, TRUE); + + for (node = account_names; node != NULL; node = g_slist_next (node)) { + ModestProtocolType current_protocol; + + current_protocol = modest_account_mgr_get_store_protocol (mgr, (gchar *) node->data); + if (current_protocol == protocol_type) { + found = TRUE; + break; + } + } + + modest_account_mgr_free_account_names (account_names); + + return found; +}