X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=c63ff484ba8ccbf274f6d368c598c83965108719;hp=a6b82a4c469e7afd857de1e73464a90980f313fb;hb=8e9ad2c9665f7d9146cef7d0c619d2a87309eaec;hpb=6ed23d6ec6b9a8ecd3145df32925c977ae777a72 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index a6b82a4..c63ff48 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -1,293 +1,434 @@ -/* modest-account-mgr.c */ - -/* insert (c)/licensing information) */ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include +#include "modest-marshal.h" +#include "modest-account-keys.h" #include "modest-account-mgr.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); +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); -static gchar* get_server_account_keyname (const gchar *accname, const gchar *name); +static gchar *get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account); /* list my signals */ enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ + ACCOUNT_CHANGED_SIGNAL, + ACCOUNT_REMOVED_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), \ MODEST_TYPE_ACCOUNT_MGR, \ 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 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) +{ + ModestAccountMgr *self; + ModestAccountMgrPrivate *priv; + + gchar *account; + gboolean is_account_key, is_server_account; + gboolean enabled; + + 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 was removed -- emit this, even if the account was disabled */ + if (is_account_key && event == MODEST_CONF_EVENT_KEY_UNSET) { + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, + account, is_server_account); + g_free (account); + return; + } + + /* is this account enabled? */ + enabled = modest_account_mgr_account_get_enabled (self, account, + is_server_account); + + /* account was changed. + * and always notify when enabled/disabled changes + */ + if (enabled || g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED)) + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, + account, key, is_server_account); + + g_free (account); +} + GType modest_account_mgr_get_type (void) { static GType my_type = 0; + if (!my_type) { static const GTypeInfo my_info = { - sizeof(ModestAccountMgrClass), - NULL, /* base init */ - NULL, /* base finalize */ + sizeof (ModestAccountMgrClass), + NULL, /* base init */ + NULL, /* base finalize */ (GClassInitFunc) modest_account_mgr_class_init, - NULL, /* class finalize */ - NULL, /* class data */ - sizeof(ModestAccountMgr), - 1, /* n_preallocs */ + NULL, /* class finalize */ + NULL, /* class data */ + sizeof (ModestAccountMgr), + 1, /* n_preallocs */ (GInstanceInitFunc) modest_account_mgr_init, }; my_type = g_type_register_static (G_TYPE_OBJECT, - "ModestAccountMgr", - &my_info, 0); + "ModestAccountMgr", + &my_info, 0); } return my_type; } static void -modest_account_mgr_class_init (ModestAccountMgrClass *klass) +modest_account_mgr_class_init (ModestAccountMgrClass * klass) { GObjectClass *gobject_class; - gobject_class = (GObjectClass*) klass; + GType paramtypes[3] = {G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER}; - parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = modest_account_mgr_finalize; + gobject_class = (GObjectClass *) klass; - g_type_class_add_private (gobject_class, sizeof(ModestAccountMgrPrivate)); + parent_class = g_type_class_peek_parent (klass); + gobject_class->finalize = modest_account_mgr_finalize; - /* 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. */ + g_type_class_add_private (gobject_class, + sizeof (ModestAccountMgrPrivate)); + + /* signal definitions */ + signals[ACCOUNT_REMOVED_SIGNAL] = + g_signal_new ("account_removed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass,account_removed), + NULL, NULL, + modest_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN); + signals[ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("account_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass,account_changed), + NULL, NULL, + modest_marshal_VOID__STRING_STRING_BOOLEAN, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); } static void -modest_account_mgr_init (ModestAccountMgr *obj) +modest_account_mgr_init (ModestAccountMgr * obj) { - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj); - priv->modest_conf = NULL; + ModestAccountMgrPrivate *priv = + MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); + + priv->modest_conf = NULL; } static void -modest_account_mgr_finalize (GObject *obj) +modest_account_mgr_finalize (GObject * obj) { - ModestAccountMgr *self = MODEST_ACCOUNT_MGR(obj); - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); + ModestAccountMgrPrivate *priv = + MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); - g_object_unref (G_OBJECT(priv->modest_conf)); - priv->modest_conf = NULL; + if (priv->modest_conf) { + g_object_unref (G_OBJECT(priv->modest_conf)); + priv->modest_conf = NULL; + } } -GObject* -modest_account_mgr_new (ModestConf *conf) + +ModestAccountMgr * +modest_account_mgr_new (ModestConf * conf) { GObject *obj; ModestAccountMgrPrivate *priv; g_return_val_if_fail (conf, NULL); - obj = G_OBJECT(g_object_new(MODEST_TYPE_ACCOUNT_MGR, NULL)); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(obj); + obj = G_OBJECT (g_object_new (MODEST_TYPE_ACCOUNT_MGR, NULL)); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); - /* - * increase the ref count on the modest_conf. Normally, the - * ModestConf should outlive the ModestAccountMgr though - */ - g_object_ref(G_OBJECT(priv->modest_conf = conf)); - return obj; + g_object_ref (G_OBJECT(conf)); + priv->modest_conf = conf; + + g_signal_connect (G_OBJECT (conf), "key_changed", + G_CALLBACK (on_key_change), + obj); + + return MODEST_ACCOUNT_MGR (obj); +} + + +static const gchar * +null_means_empty (const gchar * str) +{ + return str ? 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, +modest_account_mgr_add_account (ModestAccountMgr *self, + const gchar *name, const gchar *store_account, const gchar *transport_account, GError **err) { ModestAccountMgrPrivate *priv; gchar *key; - gboolean retval; + gboolean ok; g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - if (modest_account_mgr_account_exists (self, name, err)) { - g_warning ("account already exists"); - //return FALSE; + if (modest_account_mgr_account_exists (self, name, FALSE, err)) { + g_printerr ("modest: account already exists\n"); + return FALSE; } + /* * 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 = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME); - modest_conf_set_string (priv->modest_conf, key, name, err); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + 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); - modest_conf_set_string (priv->modest_conf, key, store_account, err); + key = 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) { + g_printerr ("modest: failed to set store account '%s'\n", + store_account); + return FALSE; + } } if (transport_account) { - key = get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT); - modest_conf_set_string (priv->modest_conf, key, transport_account, err); + key = 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) { + g_printerr ("modest: failed to set transport account '%s'\n", + transport_account); + return FALSE; + } } - return TRUE; /* TODO: error handling */ -} - - -gboolean -modest_account_mgr_remove_account (ModestAccountMgr *self, const gchar* name, - GError **err) -{ - ModestAccountMgrPrivate *priv; - gchar *key; - gboolean retval; - - g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (name, FALSE); - - if (!modest_account_mgr_account_exists (self, name, err)) { - g_warning ("account doest not exist"); - return FALSE; - } - - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - key = get_account_keyname (name, NULL); - - retval = modest_conf_remove_key (priv->modest_conf, key, NULL); - - g_free (key); - return retval; + modest_account_mgr_account_set_enabled (self, name, FALSE, TRUE); + + return TRUE; } -static const gchar* -null_means_empty(const gchar* str) -{ - return str ? str : ""; -} gboolean -modest_account_mgr_add_server_account (ModestAccountMgr *self, - const gchar *name, - const gchar *hostname, - const gchar *username, - const gchar *password, - const gchar *proto) +modest_account_mgr_add_server_account (ModestAccountMgr * self, + const gchar * name, + const gchar * hostname, + const gchar * username, + const gchar * password, + const gchar * proto) { ModestAccountMgrPrivate *priv; - gchar *acckey, *key; + gchar *key; g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - /* TODO: check already exists */ + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - acckey = g_strconcat (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", - name, NULL); - - if (modest_conf_key_exists(priv->modest_conf, acckey, NULL)) { - g_warning ("server account %s already exists", name); - g_free (acckey); + key = get_account_keyname (name, NULL, 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 = g_strconcat (acckey, "/", MODEST_ACCOUNT_HOSTNAME, NULL); - modest_conf_set_string (priv->modest_conf, key, - null_means_empty(hostname), NULL); + 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 = g_strconcat (acckey, "/", MODEST_ACCOUNT_USERNAME, NULL); - modest_conf_set_string (priv->modest_conf, key, - null_means_empty(username), NULL); + key = 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 */ - if (password) - { - key = g_strconcat (acckey, "/", MODEST_ACCOUNT_PASSWORD, NULL); - modest_conf_set_string (priv->modest_conf, key, - null_means_empty(password), NULL); - g_free (key); - } + key = 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 = g_strconcat (acckey, "/", MODEST_ACCOUNT_PROTO, NULL); - modest_conf_set_string (priv->modest_conf, key, - null_means_empty(proto), - NULL); + key = get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE); + modest_conf_set_string (priv->modest_conf, key, null_means_empty (proto), NULL); g_free (key); - return TRUE; /* FIXME: better error checking */ + /* enable it */ + modest_account_mgr_account_set_enabled (self, name, TRUE, TRUE); + + return TRUE; } + + gboolean -modest_account_mgr_remove_server_account (ModestAccountMgr *self, - const gchar *name, - GError **err) +modest_account_mgr_remove_account (ModestAccountMgr * self, + const gchar * name, + gboolean server_account, + GError ** err) { ModestAccountMgrPrivate *priv; - gchar *acckey, *key; + gchar *key; gboolean retval; g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - - acckey = g_strconcat (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", - name, NULL); - - if (!modest_conf_key_exists(priv->modest_conf, acckey, NULL)) { - g_warning ("server account %s does not exist exist", name); - g_free (acckey); + if (!modest_account_mgr_account_exists (self, name, server_account, err)) { + g_printerr ("modest: account '%s' does not exist\n", name); return FALSE; } - retval = modest_conf_remove_key (priv->modest_conf, acckey, NULL); - g_free (acckey); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + key = get_account_keyname (name, NULL, server_account); + retval = modest_conf_remove_key (priv->modest_conf, key, NULL); + + g_free (key); return retval; } + /* 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. */ static GSList* -strip_prefix_from_elements (GSList *lst, guint n) +strip_prefix_from_elements (GSList * lst, guint n) { GSList *cursor = lst; + while (cursor) { - gchar *str = (gchar*)cursor->data; + gchar *str = (gchar *) cursor->data; cursor->data = g_strdup (str + n); g_free (str); cursor = cursor->next; @@ -296,128 +437,114 @@ strip_prefix_from_elements (GSList *lst, guint n) } - -GSList* -modest_account_mgr_server_account_names (ModestAccountMgr *self, - const gchar* account_name, +GSList * +modest_account_mgr_search_server_accounts (ModestAccountMgr * self, + const gchar * account_name, ModestProtoType type, - const gchar* proto, + const gchar *proto, gboolean only_enabled) { GSList *accounts; GSList *cursor; ModestAccountMgrPrivate *priv; - const size_t prefix_len = - strlen (MODEST_SERVER_ACCOUNT_NAMESPACE "/"); - + gchar *key; + GError *err = NULL; + g_return_val_if_fail (self, NULL); - - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - accounts = modest_conf_list_subkeys (priv->modest_conf, - MODEST_SERVER_ACCOUNT_NAMESPACE, - NULL); - + + key = get_account_keyname (account_name, NULL, TRUE); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + /* get the list of all server accounts */ + accounts = modest_conf_list_subkeys (priv->modest_conf, key, &err); + if (err) { + g_error_free (err); + g_printerr ("modest: failed to get subkeys for '%s'\n", key); + return NULL; + } + /* no restrictions, return everything */ if (type == MODEST_PROTO_TYPE_ANY && !proto) - return strip_prefix_from_elements (accounts,prefix_len); - + 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 */ cursor = accounts; while (cursor) { - gchar *keyspace, *proto_key, *acc_proto; - - keyspace = (gchar*) cursor->data; - proto_key = g_strconcat (keyspace, "/", MODEST_ACCOUNT_PROTO, NULL); - acc_proto = modest_conf_get_string (priv->modest_conf, proto_key, - NULL); - g_free (proto_key); - - 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? */ - /* no match: remove from the list */ + 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 */ GSList *nxt = cursor->next; - g_free (acc_proto); 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, prefix_len); + return strip_prefix_from_elements (accounts, strlen(key)+1); + /* +1 because we must remove the ending '/' as well */ } - -GSList* -modest_account_mgr_account_names (ModestAccountMgr *self, GError **err) +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 "/"); + const size_t prefix_len = strlen (MODEST_ACCOUNT_NAMESPACE "/"); g_return_val_if_fail (self, NULL); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); + 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); } +gchar * +modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, + const gchar *key, gboolean server_account, GError **err) { -static gchar* -get_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account, - GError **err) -{ ModestAccountMgrPrivate *priv; gchar *keyname; - gchar * retval; + gchar *retval; g_return_val_if_fail (self, NULL); g_return_val_if_fail (name, NULL); g_return_val_if_fail (key, NULL); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); - - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - retval = modest_conf_get_string (priv->modest_conf,keyname,err); + keyname = get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_get_string (priv->modest_conf, keyname, err); g_free (keyname); return retval; } -gchar* -modest_account_mgr_get_server_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_string (self, name, key, TRUE, err); -} - -gchar* -modest_account_mgr_get_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_string (self, name, key, FALSE, err); -} - - - -static gint -get_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account, - GError **err) +gint +modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, + const gchar *key, gboolean server_account, GError **err) { ModestAccountMgrPrivate *priv; @@ -428,85 +555,45 @@ get_account_int (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, -1); g_return_val_if_fail (key, -1); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); + keyname = get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - retval = modest_conf_get_int (priv->modest_conf,keyname,err); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_get_int (priv->modest_conf, keyname, err); g_free (keyname); return retval; } -gint -modest_account_mgr_get_server_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_int (self, name, key, TRUE, err); -} - -gint -modest_account_mgr_get_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_int (self, name, key, FALSE, err); -} - - -static gboolean -get_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account, - GError **err) +gboolean +modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account, + const gchar * key, gboolean server_account, GError ** err) { ModestAccountMgrPrivate *priv; 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); - - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (account, FALSE); + g_return_val_if_fail (key, FALSE); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - retval = modest_conf_get_int (priv->modest_conf,keyname,err); + keyname = get_account_keyname (account, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_get_bool (priv->modest_conf, keyname, err); + g_free (keyname); return retval; } - -gint -modest_account_mgr_get_server_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_bool (self, name, key, TRUE, err); -} - -gint -modest_account_mgr_get_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, GError **err) -{ - return get_account_bool (self, name, key, FALSE, err); -} - - - - - -static gboolean -set_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, const gchar* val, gboolean server_account, - GError **err) +gboolean +modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name, + const gchar * key, const gchar * val, + gboolean server_account, GError ** err) { ModestAccountMgrPrivate *priv; @@ -517,46 +604,22 @@ set_account_string (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); + keyname = get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - - retval = modest_conf_set_string (priv->modest_conf,keyname,val,err); + retval = modest_conf_set_string (priv->modest_conf, keyname, val, + err); g_free (keyname); return retval; } - - - -gboolean -modest_account_mgr_set_server_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, const gchar* val, - GError **err) -{ - return set_account_string (self, name, key, val, TRUE, err); -} - - - gboolean -modest_account_mgr_set_account_string (ModestAccountMgr *self, const gchar *name, - const gchar *key, const gchar* val, - GError **err) -{ - return set_account_string (self, name, key, val, FALSE, err); -} - - -static gboolean -set_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account, int val, - GError **err) +modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, + const gchar * key, int val, gboolean server_account, + GError ** err) { ModestAccountMgrPrivate *priv; @@ -567,14 +630,11 @@ set_account_int (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); - - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); + keyname = get_account_keyname (name, key, server_account); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - retval = modest_conf_set_int (priv->modest_conf,keyname,val,err); + retval = modest_conf_set_int (priv->modest_conf, keyname, val, err); g_free (keyname); return retval; @@ -583,29 +643,9 @@ set_account_int (ModestAccountMgr *self, const gchar *name, gboolean -modest_account_mgr_set_server_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, int val, - GError **err) -{ - return set_account_int (self, name, key, val, TRUE, err); -} - - -gboolean -modest_account_mgr_set_account_int (ModestAccountMgr *self, const gchar *name, - const gchar *key, int val, - GError **err) -{ - return set_account_int (self, name, key, val, FALSE, err); -} - - - - -static gboolean -set_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account, gboolean val, - GError **err) +modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, + const gchar * key, gboolean val, gboolean server_account, + GError ** err) { ModestAccountMgrPrivate *priv; @@ -616,14 +656,11 @@ set_account_bool (ModestAccountMgr *self, const gchar *name, g_return_val_if_fail (name, FALSE); g_return_val_if_fail (key, FALSE); - if (server_account) - keyname = get_server_account_keyname (name, key); - else - keyname = get_account_keyname (name, key); + keyname = get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - retval = modest_conf_set_bool (priv->modest_conf,keyname,val,err); + retval = modest_conf_set_bool (priv->modest_conf, keyname, val, err); g_free (keyname); return retval; @@ -631,30 +668,8 @@ set_account_bool (ModestAccountMgr *self, const gchar *name, gboolean -modest_account_mgr_set_server_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean val, - GError **err) -{ - return set_account_bool (self, name, key, val, TRUE, err); -} - - - -gboolean -modest_account_mgr_set_account_bool (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean val, - GError **err) -{ - return set_account_bool (self, name, key, val, FALSE, err); -} - - - - - -gboolean -account_exists (ModestAccountMgr *self, const gchar *name, gboolean server_account, - GError **err) +modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, + gboolean server_account, GError ** err) { ModestAccountMgrPrivate *priv; @@ -662,64 +677,37 @@ account_exists (ModestAccountMgr *self, const gchar *name, gboolean server_accou 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); + keyname = get_account_keyname (name, NULL, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE(self); - retval = modest_conf_key_exists (priv->modest_conf,keyname,err); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + retval = modest_conf_key_exists (priv->modest_conf, keyname, err); g_free (keyname); return retval; } -gboolean -modest_account_mgr_server_account_exists (ModestAccountMgr *self, const gchar *name, - GError **err) -{ - return account_exists (self, name, TRUE, err); -} - - - -gboolean -modest_account_mgr_account_exists (ModestAccountMgr *self, const gchar *name, - GError **err) +/* must be freed by caller */ +static gchar * +get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account) { - return account_exists (self, name, FALSE, err); -} + gchar *namespace, *account_name, *retval; + + namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + if (!accname) + return g_strdup (namespace); - -/* must be freed by caller */ -static gchar* -get_account_keyname (const gchar *accname, const gchar *name) -{ + account_name = modest_conf_key_escape (NULL, accname); + if (name) - return g_strconcat - (MODEST_ACCOUNT_NAMESPACE, "/", - accname, "/", name, NULL); + retval = g_strconcat (namespace, "/", accname, "/", name, NULL); else - return g_strconcat - (MODEST_ACCOUNT_NAMESPACE, "/", - accname, NULL); -} + retval = g_strconcat (namespace, "/", accname, NULL); + g_free (account_name); -/* must be freed by caller */ -static gchar* -get_server_account_keyname (const gchar *accname, const gchar *name) -{ - if (name) - return g_strconcat - (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", - accname, "/", name, NULL); - else - return g_strconcat - (MODEST_SERVER_ACCOUNT_NAMESPACE, "/", - accname, NULL); + return retval; }