*/
#include <string.h>
-#include "modest-marshal.h"
-#include "modest-account-keys.h"
-#include "modest-account-mgr.h"
+#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_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 gchar *get_account_keyname (const gchar * accname, const gchar * name,
+ gboolean server_account);
/* list my signals */
enum {
typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
struct _ModestAccountMgrPrivate {
- ModestConf *modest_conf;
- GSList *current_accounts;
+ ModestConf *modest_conf;
+ ModestProtocolMgr *proto_mgr;
};
#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
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)
{
gchar *cursor;
gchar *account = NULL;
- /* determine if it's an account or a server account,
+ /* determine whether it's an account or a server account,
* based on the prefix */
if (g_str_has_prefix (key, account_ns)) {
/* put a NULL where the first slash was */
if (cursor)
*cursor = '\0';
-
+
return account;
}
account = 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) {
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0,
}
/* is this account enabled? */
- enabled = modest_account_mgr_account_is_enabled (self, account,
- is_server_account);
+ if (is_server_account)
+ enabled = TRUE;
+ else
+ enabled = modest_account_mgr_account_get_enabled (self, account);
/* account was changed.
* and always notify when enabled/disabled changes
sizeof (ModestAccountMgr),
1, /* n_preallocs */
(GInstanceInitFunc) modest_account_mgr_init,
+ NULL
};
my_type = g_type_register_static (G_TYPE_OBJECT,
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;
parent_class = g_type_class_peek_parent (klass);
MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
priv->modest_conf = NULL;
+ priv->proto_mgr = modest_protocol_mgr_new ();
}
static void
{
ModestAccountMgrPrivate *priv =
MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
-
- priv->modest_conf = NULL;
-}
+ if (priv->modest_conf) {
+ g_object_unref (G_OBJECT(priv->modest_conf));
+ priv->modest_conf = NULL;
+ }
+
+ if (priv->proto_mgr) {
+ g_object_unref (G_OBJECT(priv->proto_mgr));
+ priv->proto_mgr = NULL;
+ }
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
ModestAccountMgr *
modest_account_mgr_new (ModestConf * conf)
obj = G_OBJECT (g_object_new (MODEST_TYPE_ACCOUNT_MGR, NULL));
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj);
- priv->modest_conf = conf;
+ g_object_ref (G_OBJECT(conf));
+ priv->modest_conf = conf;
g_signal_connect (G_OBJECT (conf), "key_changed",
G_CALLBACK (on_key_change),
}
-
-gboolean
-modest_account_mgr_disable_account (ModestAccountMgr *self, const gchar* name,
- gboolean is_server_account)
-{
- return modest_account_mgr_set_bool (self, name,
- MODEST_ACCOUNT_ENABLED, FALSE,
- is_server_account, NULL);
-}
-
-
gboolean
-modest_account_mgr_enable_account (ModestAccountMgr *self, const gchar* name,
- gboolean is_server_account)
+modest_account_mgr_account_set_enabled (ModestAccountMgr *self, const gchar* name,
+ gboolean enabled)
{
return modest_account_mgr_set_bool (self, name,
- MODEST_ACCOUNT_ENABLED, TRUE,
- is_server_account, NULL);
+ MODEST_ACCOUNT_ENABLED, enabled,
+ FALSE, NULL);
}
gboolean
-modest_account_mgr_account_is_enabled (ModestAccountMgr *self, const gchar* name,
- gboolean is_server_account)
+modest_account_mgr_account_get_enabled (ModestAccountMgr *self, const gchar* name)
{
return modest_account_mgr_get_bool (self, name,
- MODEST_ACCOUNT_ENABLED, is_server_account,
+ MODEST_ACCOUNT_ENABLED, FALSE,
NULL);
}
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 <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, FALSE);
+ if (modest_account_mgr_account_exists (self, key, FALSE, err)) {
+ g_printerr ("modest: account already exists\n");
+ g_free (key);
+ return FALSE;
+ }
+
ok = modest_conf_set_string (priv->modest_conf, key, name, err);
g_free (key);
}
}
- modest_account_mgr_enable_account (self, name, FALSE);
+ modest_account_mgr_account_set_enabled (self, name, TRUE);
return TRUE;
}
gboolean
modest_account_mgr_add_server_account (ModestAccountMgr * self,
- const gchar * name,
- const gchar * hostname,
- const gchar * username,
- const gchar * password,
+ const gchar * name, const gchar *hostname,
+ const gchar * username, const gchar * password,
const gchar * proto)
{
ModestAccountMgrPrivate *priv;
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (name, FALSE);
+ g_return_val_if_fail (strchr(name, '/') == NULL, FALSE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
-
- key = get_account_keyname (name, NULL, TRUE);
+
+ /* hostname */
+ key = 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);
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);
-
- /* enable it */
- modest_account_mgr_enable_account (self, name, TRUE);
return TRUE;
}
-/* 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*
+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 + n, lst->data,
+ strlen(lst->data) + 1);
+ lst = lst->next;
}
- return lst;
}
GSList *
modest_account_mgr_search_server_accounts (ModestAccountMgr * self,
const gchar * account_name,
- ModestProtoType type,
- const gchar *proto,
- gboolean only_enabled)
+ ModestProtocolType type,
+ const gchar *proto)
{
GSList *accounts;
GSList *cursor;
GError *err = NULL;
g_return_val_if_fail (self, NULL);
-
+
key = get_account_keyname (account_name, NULL, TRUE);
priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
}
/* 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 */
+ if (type == MODEST_PROTOCOL_TYPE_ANY && !proto) {
+ strip_prefix_from_elements (accounts, strlen(key)+1);
+ return accounts;
+ /* +1 because we must remove the ending '/' as well */
+ }
/* otherwise, filter out the none-matching ones */
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_is_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? */
+ (type != MODEST_PROTOCOL_TYPE_ANY && /* proto type ... */
+ !modest_protocol_mgr_protocol_is_valid (priv->proto_mgr,
+ acc_proto,type)) || /* ... matches? */
+ (proto && strcmp (proto, acc_proto) != 0)) { /* proto matches? */
/* match! remove from the list */
GSList *nxt = cursor->next;
accounts = g_slist_delete_link (accounts, cursor);
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;
+
}
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;
+}
+
+
+static ModestServerAccountData*
+modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name)
+{
+ ModestServerAccountData *data;
+
+ 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);
+ data->proto = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_PROTO,
+ TRUE, NULL);
+ 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->proto);
+ 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);
}
}
+GSList *
+modest_account_mgr_get_list (ModestAccountMgr *self,
+ const gchar *name,
+ const gchar *key,
+ ModestConfValueType list_type,
+ gboolean server_account,
+ GError **err)
+{
+ ModestAccountMgrPrivate *priv;
+
+ 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);
+
+ keyname = 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);
+ g_free (keyname);
+
+ return retval;
+}
+
+
+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 = 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;
+}
+
+
+
/* must be freed by caller */
static gchar *
-get_account_keyname (const gchar * accname, const gchar * name, gboolean server_account)
+get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account)
{
- gchar *namespace, *account_name, *retval;
+ gchar *namespace;
+ gchar *retval;
namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE;
-
- if (!accname)
+
+ if (!account_name)
return g_strdup (namespace);
-
- account_name = modest_conf_key_escape (NULL, accname);
if (name)
- retval = g_strconcat (namespace, "/", accname, "/", name, NULL);
+ retval = g_strconcat (namespace, "/", account_name, "/", name, NULL);
else
- retval = g_strconcat (namespace, "/", accname, NULL);
+ retval = g_strconcat (namespace, "/", account_name, NULL);
- g_free (account_name);
+ /* 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;
}
projects / modest / blobdiff