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
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);
/* 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)
g_printerr ("modest: error getting list '%s': %s\n", keyname,
err->message);
g_error_free (err);
- retval = FALSE;
+ retval = NULL;
}
return retval;
}
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;
}
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;
}
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;
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 */
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;
- /* put a NULL where the first slash was */
- if (cursor)
- *cursor = '\0';
+ /* if there are any slashes left in the key, it's not
+ * the toplevel entry for an account
+ */
+ cursor = strstr(account, "/");
- 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);
+ if (cursor) {
+ if (is_account_key)
+ *is_account_key = TRUE;
+
+ /* 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;
}
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)
proto_name = modest_account_mgr_get_string (self, server_account_name,
MODEST_ACCOUNT_PROTO, TRUE);
if (!proto_name) {
- g_free (proto_name);
g_return_if_reached ();
+ return;
}
proto = modest_protocol_get_type_id (modest_protocol_registry_get_protocol_by_name (protocol_registry,
MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS,
g_printerr ("modest: failed to get '%s': %s\n",
MODEST_CONF_DEFAULT_ACCOUNT, err->message);
g_error_free (err);
- g_free (account);
return NULL;
}
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;
+}
projects / modest / blobdiff