X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=85b4a8b5382ea45159f7e6c8f8bc852dc91c8438;hb=1551548a3d5c9b37abc65c660b03dc0be6a99932;hp=ccbe841bdf4af1b8e122fdee0858066b7823a2a1;hpb=5024de84b7959b0b3373176d8c1f91a73427ff88;p=modest

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index ccbe841..85b4a8b 100644
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -31,21 +31,13 @@
 #include <modest-marshal.h>
 #include <modest-account-mgr.h>
 #include <modest-account-mgr-priv.h>
+#include <modest-account-mgr-helpers.h>
 
 /* 'private'/'protected' functions */
 static void modest_account_mgr_class_init (ModestAccountMgrClass * klass);
 static void modest_account_mgr_init       (ModestAccountMgr * obj);
 static void modest_account_mgr_finalize   (GObject * obj);
 
-
-typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
-struct _ModestAccountMgrPrivate {
-	ModestConf        *modest_conf;
-};
-
-#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                MODEST_TYPE_ACCOUNT_MGR, \
-                                                ModestAccountMgrPrivate))
 /* list my signals */
 enum {
 	ACCOUNT_CHANGED_SIGNAL,
@@ -70,9 +62,20 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint
 
 	self = MODEST_ACCOUNT_MGR (user_data);
 	priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+	/* there is only one not-really-account key which will still emit
+	 * a signal: a change in MODEST_CONF_DEFAULT_ACCOUNT */
+	if (key && strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0) {
+		gchar *default_account =
+			modest_account_mgr_get_default_account (self);
+		g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0,
+			       default_account, key, FALSE);
+		g_free (default_account);
+		return;
+	}
 	
 	account = _modest_account_mgr_account_from_key (key, &is_account_key, &is_server_account);
-
+	
 	/* if this is not an account-related key change, ignore */
 	if (!account)
 		return;
@@ -89,12 +92,14 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint
 	if (is_server_account)
 		enabled = TRUE;
 	else 
-		enabled = modest_account_mgr_account_get_enabled (self, account);
+		enabled = modest_account_mgr_get_enabled (self, account);
 
-	/* account was changed.
+	/* server account was changed, default account was changed
 	 * and always notify when enabled/disabled changes
 	 */
-	if (enabled || g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED)) 
+	if (enabled ||
+	    g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED) ||
+	    strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0)
 		g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0,
 			       account, key, is_server_account);
 
@@ -183,6 +188,7 @@ modest_account_mgr_finalize (GObject * obj)
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+
 ModestAccountMgr *
 modest_account_mgr_new (ModestConf * conf)
 {
@@ -222,7 +228,8 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
 	ModestAccountMgrPrivate *priv;
 	gchar *key;
 	gboolean ok;
-
+	gchar *default_account;
+	
 	g_return_val_if_fail (self, FALSE);
 	g_return_val_if_fail (name, FALSE);
 	g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
@@ -268,8 +275,13 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
 			return FALSE;
 		}
 	}
+	modest_account_mgr_set_enabled (self, name, TRUE);
 
-	modest_account_mgr_account_set_enabled (self, name, TRUE);
+	/* if no default account has been defined yet, do so now */
+	default_account = modest_account_mgr_get_default_account (self);
+	if (!default_account)
+		modest_account_mgr_set_default_account (self, name);
+	g_free (default_account);
 	
 	return TRUE;
 }
@@ -329,6 +341,37 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self,
 }
 
 
+gboolean
+modest_account_mgr_add_server_account_uri (ModestAccountMgr * self,
+					   const gchar *name, ModestProtocol proto,
+					   const gchar *uri)
+{
+	ModestAccountMgrPrivate *priv;
+	gchar *key;
+	
+	g_return_val_if_fail (self, FALSE);
+	g_return_val_if_fail (name, FALSE);
+	g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
+	g_return_val_if_fail (uri, FALSE);
+	
+	priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+
+	/* proto */
+	key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE);
+	modest_conf_set_string (priv->modest_conf, key,
+				modest_protocol_info_get_protocol_name(proto), NULL);
+	g_free (key);
+	
+	/* uri */
+	key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_URI, TRUE);
+	modest_conf_set_string (priv->modest_conf, key,	uri, NULL);
+	g_free (key);
+
+	return TRUE;
+}
+
+
 
 gboolean
 modest_account_mgr_remove_account (ModestAccountMgr * self,
@@ -455,7 +498,6 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
 }
 
 
-
 gchar *
 modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
 			       const gchar *key, gboolean server_account, GError **err) {