X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=c0b7cf286072b60f105829b0ddbdcca25a401025;hb=151bb7b4a2b461b332ecffaca6bc26a0bc530958;hp=bc6d51b9317d8e2c0b0e3f7f39f66eb68007631c;hpb=c5a5b586adace0a0a65316ea89ecbf52e5b08430;p=modest

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index bc6d51b..c0b7cf2 100644
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -342,6 +342,7 @@ modest_account_mgr_add_account_from_settings (ModestAccountMgr *self,
 				
 	/* Notify the observers */
 	g_signal_emit (self, signals[ACCOUNT_INSERTED_SIGNAL], 0, account_name);
+	modest_platform_emit_account_created_signal (account_name);
 
 	/* if no default account has been defined yet, do so now */
 	default_account = modest_account_mgr_get_default_account (self);
@@ -456,6 +457,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
 
 	/* Notify the observers */
 	g_signal_emit (self, signals[ACCOUNT_INSERTED_SIGNAL], 0, name);
+	modest_platform_emit_account_created_signal (name);
 
 	/* if no default account has been defined yet, do so now */
 	default_account = modest_account_mgr_get_default_account (self);
@@ -717,6 +719,7 @@ modest_account_mgr_remove_account (ModestAccountMgr * self,
 	   the keys, because otherwise a call to account_names
 	   will retrieve also the deleted account */
 	g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, name);
+	modest_platform_emit_account_removed_signal (name);
 	
 	return TRUE;
 }
@@ -959,7 +962,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;
@@ -1291,6 +1294,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;
@@ -1298,10 +1306,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_defs_namespace (MODEST_ACCOUNT_SUBNAMESPACE "/");
-	const gchar* server_account_ns = modest_defs_namespace (MODEST_SERVER_ACCOUNT_SUBNAMESPACE "/");
-	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 */
@@ -1309,37 +1315,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;
 
-	/* 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;
 }
 
 
@@ -1684,7 +1693,7 @@ modest_account_mgr_singleton_protocol_exists (ModestAccountMgr *mgr,
 	gboolean found = FALSE;
 
 	g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR (mgr), FALSE);
-	account_names = modest_account_mgr_account_names (mgr, TRUE);
+	account_names = modest_account_mgr_account_names (mgr, FALSE);
 
 	for (node = account_names; node != NULL; node = g_slist_next (node)) {
 		ModestProtocolType current_protocol;