X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=ebbf2fbdba3daa1089c03bf44edf723f2a6b045f;hp=ce093f330d6428ee5b36686fb426527e88ce8ca1;hb=8636cb7c6267a4668fb1e1d455077cf0c5784316;hpb=cd52c8748afe0d7ef9987994d2f2386c2f53fbee diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index ce093f3..ebbf2fb 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -28,16 +28,15 @@ */ #include -#include "modest-marshal.h" -#include "modest-account-keys.h" -#include "modest-account-mgr.h" +#include +#include +#include +#include /* '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); - -static gchar *get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account); +static void modest_account_mgr_init (ModestAccountMgr * obj); +static void modest_account_mgr_finalize (GObject * obj); /* list my signals */ enum { @@ -46,65 +45,11 @@ enum { 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), \ - MODEST_TYPE_ACCOUNT_MGR, \ - ModestAccountMgrPrivate)) /* globals */ static GObjectClass *parent_class = NULL; - static guint signals[LAST_SIGNAL] = {0}; - -static gchar* -account_from_key (const gchar *key, gboolean *is_account_key, gboolean *is_server_account) -{ - const gchar* account_ns = MODEST_ACCOUNT_NAMESPACE "/"; - const gchar* server_account_ns = MODEST_SERVER_ACCOUNT_NAMESPACE "/"; - gchar *cursor; - gchar *account = NULL; - - /* determine if it's an account or a server account, - * based on the prefix */ - if (g_str_has_prefix (key, account_ns)) { - - 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)); - } 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; - - /* put a NULL where the first slash was */ - if (cursor) - *cursor = '\0'; - - return account; -} - - - - static void on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data) { @@ -118,7 +63,11 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint self = MODEST_ACCOUNT_MGR (user_data); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - account = account_from_key (key, &is_account_key, &is_server_account); + 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; /* account was removed -- emit this, even if the account was disabled */ if (is_account_key && event == MODEST_CONF_EVENT_KEY_UNSET) { @@ -129,8 +78,10 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint } /* is this account enabled? */ - enabled = modest_account_mgr_account_get_enabled (self, account, - is_server_account); + if (is_server_account) + enabled = TRUE; + else + enabled = modest_account_mgr_get_enabled (self, account); /* account was changed. * and always notify when enabled/disabled changes @@ -159,6 +110,7 @@ modest_account_mgr_get_type (void) sizeof (ModestAccountMgr), 1, /* n_preallocs */ (GInstanceInitFunc) modest_account_mgr_init, + NULL }; my_type = g_type_register_static (G_TYPE_OBJECT, @@ -219,8 +171,9 @@ modest_account_mgr_finalize (GObject * obj) g_object_unref (G_OBJECT(priv->modest_conf)); priv->modest_conf = NULL; } -} + G_OBJECT_CLASS(parent_class)->finalize (obj); +} ModestAccountMgr * modest_account_mgr_new (ModestConf * conf) @@ -252,26 +205,6 @@ null_means_empty (const gchar * str) gboolean -modest_account_mgr_account_set_enabled (ModestAccountMgr *self, const gchar* name, - gboolean is_server_account, gboolean enabled) -{ - return modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_ENABLED, enabled, - is_server_account, NULL); -} - - -gboolean -modest_account_mgr_account_get_enabled (ModestAccountMgr *self, const gchar* name, - gboolean is_server_account) -{ - return modest_account_mgr_get_bool (self, name, - MODEST_ACCOUNT_ENABLED, is_server_account, - NULL); -} - - -gboolean modest_account_mgr_add_account (ModestAccountMgr *self, const gchar *name, const gchar *store_account, @@ -284,29 +217,30 @@ modest_account_mgr_add_account (ModestAccountMgr *self, g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - - if (modest_account_mgr_account_exists (self, name, FALSE, err)) { - g_printerr ("modest: account already exists\n"); - return FALSE; - } + g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); /* * we create the account by adding an account 'dir', with the name , * and in that the 'display_name' string key */ - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); + if (modest_account_mgr_account_exists (self, key, FALSE, err)) { + g_printerr ("modest: account already exists\n"); + g_free (key); + return FALSE; + } - key = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); ok = modest_conf_set_string (priv->modest_conf, key, name, err); g_free (key); - if (!ok) { g_printerr ("modest: cannot set display name\n"); return FALSE; } if (store_account) { - key = get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); ok = modest_conf_set_string (priv->modest_conf, key, store_account, err); g_free (key); if (!ok) { @@ -317,7 +251,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, } if (transport_account) { - key = get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE); ok = modest_conf_set_string (priv->modest_conf, key, transport_account, err); g_free (key); if (!ok) { @@ -326,8 +260,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, return FALSE; } } - - modest_account_mgr_account_set_enabled (self, name, FALSE, TRUE); + modest_account_mgr_set_enabled (self, name, TRUE); return TRUE; } @@ -337,50 +270,51 @@ modest_account_mgr_add_account (ModestAccountMgr *self, gboolean modest_account_mgr_add_server_account (ModestAccountMgr * self, - const gchar * name, - const gchar * hostname, - const gchar * username, - const gchar * password, - const gchar * proto) + const gchar * name, const gchar *hostname, + const gchar * username, const gchar * password, + ModestProtocol proto) { ModestAccountMgrPrivate *priv; gchar *key; - + ModestProtocolType proto_type; + g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); + g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); + proto_type = modest_protocol_info_get_protocol_type (proto); + g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT || + proto_type == MODEST_PROTOCOL_TYPE_STORE, FALSE); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - - key = get_account_keyname (name, NULL, TRUE); + + /* hostname */ + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); if (modest_conf_key_exists (priv->modest_conf, key, NULL)) { g_printerr ("modest: server account '%s' already exists", name); g_free (key); return FALSE; } - g_free (key); - /* hostname */ - key = get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); modest_conf_set_string (priv->modest_conf, key, null_means_empty(hostname), NULL); g_free (key); /* username */ - key = get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), NULL); g_free (key); /* password */ - key = get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); + key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), NULL); g_free (key); /* proto */ - key = get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE); - modest_conf_set_string (priv->modest_conf, key, null_means_empty (proto), NULL); + 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); - - /* enable it */ - modest_account_mgr_account_set_enabled (self, name, TRUE, TRUE); return TRUE; } @@ -406,7 +340,7 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, } priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - key = get_account_keyname (name, NULL, server_account); + key = _modest_account_mgr_get_account_keyname (name, NULL, server_account); retval = modest_conf_remove_key (priv->modest_conf, key, NULL); @@ -416,31 +350,27 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, -/* strip the first /n/ character from each element */ -/* caller must make sure all elements are strings with +/* strip the first /n/ character from each element + * caller must make sure all elements are strings with * length >= n, and also that data can be freed. + * change is in-place */ -static GSList* +static void strip_prefix_from_elements (GSList * lst, guint n) { - GSList *cursor = lst; - - while (cursor) { - gchar *str = (gchar *) cursor->data; - cursor->data = g_strdup (str + n); - g_free (str); - cursor = cursor->next; + while (lst) { + memmove (lst->data, lst->data + n, + strlen(lst->data) - n + 1); + lst = lst->next; } - return lst; } -GSList * +GSList* modest_account_mgr_search_server_accounts (ModestAccountMgr * self, const gchar * account_name, - ModestProtoType type, - const gchar *proto, - gboolean only_enabled) + ModestProtocolType type, + ModestProtocol proto) { GSList *accounts; GSList *cursor; @@ -449,8 +379,15 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, GError *err = NULL; g_return_val_if_fail (self, NULL); + + if (proto != MODEST_PROTOCOL_UNKNOWN) { + ModestProtocolType proto_type; + proto_type = modest_protocol_info_get_protocol_type (proto); + g_return_val_if_fail (proto_type == MODEST_PROTOCOL_TYPE_TRANSPORT || + proto_type == MODEST_PROTOCOL_TYPE_STORE, NULL); + } - key = get_account_keyname (account_name, NULL, TRUE); + key = _modest_account_mgr_get_account_keyname (account_name, NULL, TRUE); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); /* get the list of all server accounts */ @@ -461,59 +398,51 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, return NULL; } - /* no restrictions, return everything */ - if (type == MODEST_PROTO_TYPE_ANY && !proto) - return strip_prefix_from_elements (accounts, strlen(key)+1); - /* +1 because we must remove the ending '/' as well */ - - /* otherwise, filter out the none-matching ones */ + /* filter out the ones with the wrong protocol */ + /* we could optimize for unknown proto / unknown type, but it will only + * make the code more complex */ cursor = accounts; - while (cursor) { - gchar *account; - gchar *acc_proto; - gboolean enabled; - - account = account_from_key ((gchar*)cursor->data, NULL, NULL); - - enabled = modest_account_mgr_account_get_enabled (self, account, TRUE); - acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO, - TRUE, NULL); - if ((!acc_proto) || /* proto not defined? */ - (type != MODEST_PROTO_TYPE_ANY && /* proto type ... */ - modest_proto_type (acc_proto) != type) || /* ... matches? */ - (proto && strcmp (proto, acc_proto) != 0) || /* proto matches? */ - (!enabled && only_enabled)) { /* account enabled? */ - /* match! remove from the list */ + while (cursor) { + gchar *account = _modest_account_mgr_account_from_key ((gchar*)cursor->data, NULL, NULL); + gchar *acc_proto = modest_account_mgr_get_string (self, account, MODEST_ACCOUNT_PROTO, + TRUE, NULL); + ModestProtocol this_proto = modest_protocol_info_get_protocol (acc_proto); + ModestProtocolType this_type = modest_protocol_info_get_protocol_type (this_proto); + + if ((this_type != MODEST_PROTOCOL_TYPE_UNKNOWN && this_type != type) || + (this_proto != MODEST_PROTOCOL_UNKNOWN && this_proto != proto)) { GSList *nxt = cursor->next; accounts = g_slist_delete_link (accounts, cursor); cursor = nxt; } else cursor = cursor->next; - + g_free (account); g_free (acc_proto); } - - return strip_prefix_from_elements (accounts, strlen(key)+1); + /* +1 because we must remove the ending '/' as well */ + strip_prefix_from_elements (accounts, strlen(key)+1); + return accounts; } -GSList * +GSList* modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) { GSList *accounts; ModestAccountMgrPrivate *priv; const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/"); - g_return_val_if_fail (self, NULL); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); accounts = modest_conf_list_subkeys (priv->modest_conf, MODEST_ACCOUNT_NAMESPACE, err); - return strip_prefix_from_elements (accounts, prefix_len); + + strip_prefix_from_elements (accounts, prefix_len); + return accounts; } @@ -530,7 +459,7 @@ modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, NULL); g_return_val_if_fail (key, NULL); - keyname = get_account_keyname (name, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_get_string (priv->modest_conf, keyname, err); @@ -553,7 +482,7 @@ modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, -1); g_return_val_if_fail (key, -1); - keyname = get_account_keyname (name, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_get_int (priv->modest_conf, keyname, err); @@ -577,7 +506,7 @@ modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account, g_return_val_if_fail (account, FALSE); g_return_val_if_fail (key, FALSE); - keyname = get_account_keyname (account, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (account, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_get_bool (priv->modest_conf, keyname, err); @@ -602,7 +531,7 @@ modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - keyname = get_account_keyname (name, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); @@ -628,7 +557,7 @@ modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - keyname = get_account_keyname (name, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); @@ -654,7 +583,7 @@ modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - keyname = get_account_keyname (name, key, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); @@ -664,6 +593,29 @@ modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, return retval; } +void +modest_account_mgr_set_list (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + GSList *val, + ModestConfValueType list_type, + gboolean server_account, + GError **err) +{ + ModestAccountMgrPrivate *priv; + gchar *keyname; + + g_return_if_fail (self); + g_return_if_fail (name); + g_return_if_fail (key); + g_return_if_fail (val); + + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + modest_conf_set_list (priv->modest_conf, keyname, val, list_type, err); + g_free (keyname); +} gboolean modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, @@ -677,7 +629,7 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - keyname = get_account_keyname (name, NULL, server_account); + keyname = _modest_account_mgr_get_account_keyname (name, NULL, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_key_exists (priv->modest_conf, keyname, err); @@ -687,25 +639,54 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, } -/* must be freed by caller */ -static gchar * -get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account) +GSList * +modest_account_mgr_get_list (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + ModestConfValueType list_type, + gboolean server_account, + GError **err) { - gchar *namespace, *account_name, *retval; - - namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + ModestAccountMgrPrivate *priv; - if (!accname) - return g_strdup (namespace); + gchar *keyname; + GSList *retval; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (name, NULL); + g_return_val_if_fail (key, NULL); - account_name = modest_conf_key_escape (NULL, accname); + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); - if (name) - retval = g_strconcat (namespace, "/", accname, "/", name, NULL); - else - retval = g_strconcat (namespace, "/", accname, NULL); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, err); + g_free (keyname); + + return retval; +} - g_free (account_name); +gboolean +modest_account_mgr_unset (ModestAccountMgr *self, + const gchar *name, + const gchar *key, + gboolean server_account, + GError **err) +{ + ModestAccountMgrPrivate *priv; + + gchar *keyname; + gboolean retval; + + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (name, FALSE); + g_return_val_if_fail (key, FALSE); + + keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_remove_key (priv->modest_conf, keyname, err); + + g_free (keyname); return retval; }