X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=ebbf2fbdba3daa1089c03bf44edf723f2a6b045f;hp=95b9fb9dc09d7d7364126c8530c6ff6b396682b3;hb=8636cb7c6267a4668fb1e1d455077cf0c5784316;hpb=d0c75927f2398e6d498c84ceb3e51c57e019e376 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 95b9fb9..ebbf2fb 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -28,18 +28,16 @@ */ #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); - /* list my signals */ enum { ACCOUNT_CHANGED_SIGNAL, @@ -47,62 +45,11 @@ enum { LAST_SIGNAL }; -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)) /* 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 whether 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) { @@ -116,7 +63,7 @@ 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) @@ -134,7 +81,7 @@ 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. * and always notify when enabled/disabled changes @@ -258,25 +205,6 @@ null_means_empty (const gchar * str) gboolean -modest_account_mgr_account_set_enabled (ModestAccountMgr *self, const gchar* name, - gboolean enabled) -{ - return modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_ENABLED, enabled, - FALSE, NULL); -} - - -gboolean -modest_account_mgr_account_get_enabled (ModestAccountMgr *self, const gchar* name) -{ - return modest_account_mgr_get_bool (self, name, - MODEST_ACCOUNT_ENABLED, FALSE, - NULL); -} - - -gboolean modest_account_mgr_add_account (ModestAccountMgr *self, const gchar *name, const gchar *store_account, @@ -297,7 +225,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, * we create the account by adding an account 'dir', with the name , * and in that the 'display_name' string key */ - key = get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); + 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); @@ -306,14 +234,13 @@ modest_account_mgr_add_account (ModestAccountMgr *self, 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) { @@ -324,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) { @@ -333,8 +260,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, return FALSE; } } - - modest_account_mgr_account_set_enabled (self, name, TRUE); + modest_account_mgr_set_enabled (self, name, TRUE); return TRUE; } @@ -363,7 +289,7 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); /* hostname */ - key = get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); + 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); @@ -374,17 +300,17 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, 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); + 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); @@ -414,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); @@ -461,7 +387,7 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, 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 */ @@ -477,7 +403,7 @@ modest_account_mgr_search_server_accounts (ModestAccountMgr * self, * make the code more complex */ cursor = accounts; while (cursor) { - gchar *account = account_from_key ((gchar*)cursor->data, NULL, NULL); + 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); @@ -520,120 +446,6 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err) } -static ModestServerAccountData* -modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name) -{ - ModestServerAccountData *data; - gchar *proto; - - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, - TRUE, NULL), NULL); - data = g_new0 (ModestServerAccountData, 1); - - data->account_name = g_strdup (name); - data->hostname = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_HOSTNAME, - TRUE, NULL); - data->username = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_USERNAME, - TRUE, NULL); - - proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, - TRUE, NULL); - data->proto = modest_protocol_info_get_protocol (proto); - g_free (proto); - - data->password = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); - return data; -} - - -static void -modest_account_mgr_free_server_account_data (ModestAccountMgr *self, - ModestServerAccountData* data) -{ - g_return_if_fail (self); - - if (!data) - return; /* not an error */ - - g_free (data->account_name); - g_free (data->hostname); - g_free (data->username); - g_free (data->password); - - g_free (data); -} - - -ModestAccountData* -modest_account_mgr_get_account_data (ModestAccountMgr *self, const gchar* name) -{ - ModestAccountData *data; - gchar *server_account; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (name, NULL); - g_return_val_if_fail (modest_account_mgr_account_exists (self, name, - FALSE, NULL), NULL); - data = g_new0 (ModestAccountData, 1); - - data->account_name = g_strdup (name); - data->full_name = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_FULLNAME, - FALSE, NULL); - data->email = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_EMAIL, - FALSE, NULL); - data->enabled = modest_account_mgr_account_get_enabled (self, name); - - /* store */ - server_account = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_STORE_ACCOUNT, - FALSE, NULL); - if (server_account) { - data->store_account = - modest_account_mgr_get_server_account_data (self, - server_account); - g_free (server_account); - } - - /* transport */ - server_account = modest_account_mgr_get_string (self, name, - MODEST_ACCOUNT_TRANSPORT_ACCOUNT, - FALSE, NULL); - if (server_account) { - data->transport_account = - modest_account_mgr_get_server_account_data (self, - server_account); - g_free (server_account); - } - - return data; -} - - -void -modest_account_mgr_free_account_data (ModestAccountMgr *self, ModestAccountData *data) -{ - g_return_if_fail (self); - - if (!data) - return; - - g_free (data->account_name); - g_free (data->full_name); - g_free (data->email); - - modest_account_mgr_free_server_account_data (self, data->store_account); - modest_account_mgr_free_server_account_data (self, data->transport_account); - - g_free (data); -} - - gchar * modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, const gchar *key, gboolean server_account, GError **err) { @@ -647,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); @@ -670,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); @@ -694,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); @@ -719,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); @@ -745,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); @@ -771,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); @@ -798,7 +610,7 @@ modest_account_mgr_set_list (ModestAccountMgr *self, g_return_if_fail (key); g_return_if_fail (val); - 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); modest_conf_set_list (priv->modest_conf, keyname, val, list_type, err); @@ -817,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); @@ -844,7 +656,7 @@ modest_account_mgr_get_list (ModestAccountMgr *self, 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_list (priv->modest_conf, keyname, list_type, err); @@ -870,7 +682,7 @@ modest_account_mgr_unset (ModestAccountMgr *self, 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); retval = modest_conf_remove_key (priv->modest_conf, keyname, err); @@ -878,39 +690,3 @@ modest_account_mgr_unset (ModestAccountMgr *self, g_free (keyname); return retval; } - - - -/* must be freed by caller */ -static gchar * -get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account) -{ - gchar *namespace; - gchar *retval; - - namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; - - if (!account_name) - return g_strdup (namespace); - - if (name) - retval = g_strconcat (namespace, "/", account_name, "/", name, NULL); - else - retval = g_strconcat (namespace, "/", account_name, NULL); - - /* special case: the key has some weird characters */ - if (!modest_conf_key_is_valid (retval)) { - - gchar *account_name_esc, *name_esc; - g_free (retval); - - account_name_esc = account_name ? modest_conf_key_escape (account_name) : NULL; - name_esc = name ? modest_conf_key_escape (name) : NULL; - - retval = get_account_keyname (account_name_esc, name_esc, server_account); - - g_free (account_name_esc); - g_free (name_esc); - } - return retval; -}