X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=4bbc96a26762a741312efd270a7a1439cb9d9ded;hp=3ea2ed627166e6281e7c1a8abdeb2c261f21f9cc;hb=32320a187c364c57585a45475acee9f6f9ce88c1;hpb=a9e70c921dfadd98751af998d5266dae38ca1df8 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 3ea2ed6..4bbc96a 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -3,6 +3,8 @@ /* insert (c)/licensing information) */ #include +#include "modest-marshal.h" +#include "modest-account-keys.h" #include "modest-account-mgr.h" /* 'private'/'protected' functions */ @@ -16,14 +18,16 @@ static gchar *get_server_account_keyname (const gchar * accname, /* list my signals */ enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ + ACCOUNT_CHANGE_SIGNAL, + ACCOUNT_REMOVE_SIGNAL, + ACCOUNT_ADD_SIGNAL, LAST_SIGNAL }; typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate; struct _ModestAccountMgrPrivate { ModestConf *modest_conf; + GSList *current_accounts; }; #define MODEST_ACCOUNT_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -32,8 +36,89 @@ struct _ModestAccountMgrPrivate { /* globals */ static GObjectClass *parent_class = NULL; -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ +static guint signals[LAST_SIGNAL] = {0}; + + +static GSList * +delete_account_from_list (GSList *list, const gchar *name) +{ + GSList *iter, *result; + + iter = list; + result = list; + while (iter) { + if (!strcmp (name, iter->data)) { + result = g_slist_delete_link (list, iter); + break; + } + + iter = g_slist_next (iter); + } + return result; +} + +static GSList * +find_account_in_list (GSList *list, const gchar *name) +{ + GSList *iter, *result; + + iter = list; + result = list; + while (iter) { + if (!strcmp (name, iter->data)) { + return iter; + break; + } + + iter = g_slist_next (iter); + } + return NULL; +} + +/* Map configuration changes to account changes. + * Doing this here makes sure all changes are available and external changes + * are covered as well. */ + +static void +modest_account_mgr_check_change (ModestConf *conf, const gchar *key, + const gchar *new_value, gpointer user_data) +{ + ModestAccountMgr *amgr = user_data; + ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (amgr); + + if ((strlen (key) > strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/") + && g_str_has_prefix (key, MODEST_SERVER_ACCOUNT_NAMESPACE))) { + gchar *subkey = g_strdup(key + strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/")); + + if (! strstr (subkey, "/")) { /* no more '/' means an account was modified */ + if (!new_value) { + priv->current_accounts = + delete_account_from_list (priv->current_accounts, subkey); + + g_signal_emit (amgr, signals[ACCOUNT_REMOVE_SIGNAL], 0, subkey); + } + } + else { + gchar *param; + + param = strstr (subkey, "/"); + param [0] = 0; + param++; + + /* that's the second case for a new account */ + if (!find_account_in_list (priv->current_accounts, subkey) && strstr (param, MODEST_ACCOUNT_PROTO)) { + priv->current_accounts = + g_slist_prepend (priv->current_accounts, g_strdup (subkey)); + g_signal_emit (amgr, signals[ACCOUNT_ADD_SIGNAL], 0, subkey); + } + + g_signal_emit (amgr, signals[ACCOUNT_CHANGE_SIGNAL], 0, subkey, param, new_value); + } + + g_free (subkey); + } +} + GType modest_account_mgr_get_type (void) @@ -64,6 +149,7 @@ static void modest_account_mgr_class_init (ModestAccountMgrClass * klass) { GObjectClass *gobject_class; + GType paramtypes[3] = {G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER}; gobject_class = (GObjectClass *) klass; @@ -73,12 +159,26 @@ modest_account_mgr_class_init (ModestAccountMgrClass * klass) g_type_class_add_private (gobject_class, sizeof (ModestAccountMgrPrivate)); - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ + /* signal definitions */ + signals[ACCOUNT_ADD_SIGNAL] = + g_signal_newv ("account-add", + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, + NULL, NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, paramtypes); + + signals[ACCOUNT_REMOVE_SIGNAL] = + g_signal_newv ("account-remove", + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, + NULL, NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, paramtypes); + signals[ACCOUNT_CHANGE_SIGNAL] = + g_signal_newv ("account-change", + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, + NULL, NULL, NULL, + modest_marshal_VOID__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, paramtypes); } @@ -118,6 +218,11 @@ modest_account_mgr_new (ModestConf * conf) * ModestConf should outlive the ModestAccountMgr though */ g_object_ref (G_OBJECT (priv->modest_conf = conf)); + + priv->current_accounts = modest_account_mgr_account_names (MODEST_ACCOUNT_MGR(obj), NULL); + + g_signal_connect (G_OBJECT (conf), "key-changed", + G_CALLBACK (modest_account_mgr_check_change), obj); return obj; } @@ -130,7 +235,6 @@ modest_account_mgr_add_account (ModestAccountMgr * self, const gchar * name, { ModestAccountMgrPrivate *priv; gchar *key; - gboolean retval; g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); @@ -264,7 +368,7 @@ modest_account_mgr_remove_server_account (ModestAccountMgr * self, const gchar * name, GError ** err) { ModestAccountMgrPrivate *priv; - gchar *acckey, *key; + gchar *acckey; gboolean retval; g_return_val_if_fail (self, FALSE); @@ -367,7 +471,7 @@ modest_account_mgr_server_account_names (ModestAccountMgr * self, GSList * modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) { - GSList *accounts, *cursor; + GSList *accounts; ModestAccountMgrPrivate *priv; const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/"); @@ -377,15 +481,15 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); accounts = modest_conf_list_subkeys (priv->modest_conf, - MODEST_ACCOUNT_NAMESPACE, err); + MODEST_ACCOUNT_NAMESPACE, err); return strip_prefix_from_elements (accounts, prefix_len); } static gchar * get_account_string (ModestAccountMgr * self, const gchar * name, - const gchar * key, gboolean server_account, GError ** err) -{ + const gchar * key, gboolean server_account, GError ** err) { + ModestAccountMgrPrivate *priv; gchar *keyname; @@ -480,9 +584,9 @@ get_account_bool (ModestAccountMgr * self, const gchar * name, gchar *keyname; gboolean retval; - g_return_val_if_fail (self, -1); - g_return_val_if_fail (name, -1); - g_return_val_if_fail (key, -1); + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (name, FALSE); + g_return_val_if_fail (key, FALSE); if (server_account) keyname = get_server_account_keyname (name, key); @@ -490,7 +594,7 @@ get_account_bool (ModestAccountMgr * self, const gchar * name, keyname = get_account_keyname (name, key); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - retval = modest_conf_get_int (priv->modest_conf, keyname, err); + retval = modest_conf_get_bool (priv->modest_conf, keyname, err); g_free (keyname); return retval; @@ -668,12 +772,12 @@ account_exists (ModestAccountMgr * self, const gchar * name, gboolean retval; g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (name, FALSE); + g_return_val_if_fail (name, FALSE); if (server_account) - keyname = get_account_keyname (name, NULL); - else keyname = get_server_account_keyname (name, NULL); + else + keyname = get_account_keyname (name, NULL); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_key_exists (priv->modest_conf, keyname, err);