X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=bc6d51b9317d8e2c0b0e3f7f39f66eb68007631c;hp=c3e12dc296f5ecd5ea036cf6f2762be4e853f46e;hb=33a7162c8d9d7971f99c78f61d7981342e93557a;hpb=ec8925519fa4360d9ad4b8206e87feee55979534

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index c3e12dc..bc6d51b 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);
 
@@ -1277,8 +1298,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 "/";
+	const gchar* account_ns        = modest_defs_namespace (MODEST_ACCOUNT_SUBNAMESPACE "/");
+	const gchar* server_account_ns = modest_defs_namespace (MODEST_SERVER_ACCOUNT_SUBNAMESPACE "/");
 	gchar *cursor;
 	gchar *account = NULL;
 
@@ -1349,7 +1370,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)