X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=d37c498237016ad8eb559a5a3f2225ac55a89311;hp=6a59becfe7d2d88d0c4461c1d0b94d2ee603a691;hb=3b5cac93a4d81e187edca49db15816a800cd5e82;hpb=bf0bd3c7d05b5a7882c44257c66d580bce9935f4 diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 6a59bec..d37c498 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -29,118 +29,40 @@ #include #include +#include #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 void modest_account_mgr_base_init (gpointer g_class); + +static const gchar *_modest_account_mgr_get_account_keyname_cached (ModestAccountMgrPrivate *priv, + const gchar* account_name, + const gchar *name, + gboolean is_server); + +static gboolean modest_account_mgr_unset_default_account (ModestAccountMgr *self); /* list my signals */ enum { + ACCOUNT_INSERTED_SIGNAL, ACCOUNT_CHANGED_SIGNAL, ACCOUNT_REMOVED_SIGNAL, ACCOUNT_BUSY_SIGNAL, + DEFAULT_ACCOUNT_CHANGED_SIGNAL, + DISPLAY_NAME_CHANGED_SIGNAL, LAST_SIGNAL }; - /* globals */ static GObjectClass *parent_class = NULL; static guint signals[LAST_SIGNAL] = {0}; -/* We signal key changes in batches, every X seconds: */ -static gboolean -on_timeout_notify_changes (gpointer data) -{ - ModestAccountMgr *self = MODEST_ACCOUNT_MGR (data); - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - - /* TODO: Also store the account names, and notify one list for each account, - * if anything uses the account names. */ - - if (priv->changed_conf_keys) { - gchar *default_account = - modest_account_mgr_get_default_account (self); - - /* printf ("DEBUG: %s: priv->changed_conf_key length=%d\n", - __FUNCTION__, g_slist_length (priv->changed_conf_keys)); */ - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, - default_account, priv->changed_conf_keys, FALSE); - - g_free (default_account); - - g_slist_foreach (priv->changed_conf_keys, (GFunc) g_free, NULL); - g_slist_free (priv->changed_conf_keys); - priv->changed_conf_keys = NULL; - } - - return TRUE; /* Call this again later. */ -} - -static void -on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data) -{ - ModestAccountMgr *self = MODEST_ACCOUNT_MGR (user_data); - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - gboolean is_account_key; - gboolean is_server_account; - gchar* account = NULL; - - /* there is only one not-really-account key which will still emit - * a signal: a change in MODEST_CONF_DEFAULT_ACCOUNT */ - if (key && strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0) { - /* Get the default account instead. */ - - /* Store the key for later notification in our timeout callback. - * Notifying for every key change would cause unnecessary work: */ - priv->changed_conf_keys = g_slist_append (priv->changed_conf_keys, - (gpointer) g_strdup (key)); - } - - is_account_key = FALSE; - is_server_account = FALSE; - 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. Do not emit an account removed signal - because it was already being done in the remove_account - method. Do not notify also the removal of the server - account keys for the same reason */ - if ((is_account_key || is_server_account) && - event == MODEST_CONF_EVENT_KEY_UNSET) { - g_free (account); - return; - } - - /* is this account enabled? */ - gboolean enabled = FALSE; - if (is_server_account) - enabled = TRUE; - else - enabled = modest_account_mgr_get_enabled (self, account); - - /* Notify is server account was changed, default account was changed - * or when enabled/disabled changes: - */ - if (enabled || - g_str_has_suffix (key, MODEST_ACCOUNT_ENABLED) || - strcmp (key, MODEST_CONF_DEFAULT_ACCOUNT) == 0) { - /* Store the key for later notification in our timeout callback. - * Notifying for every key change would cause unnecessary work: */ - priv->changed_conf_keys = g_slist_append (NULL, - (gpointer) g_strdup (key)); - } - g_free (account); -} - - GType modest_account_mgr_get_type (void) { @@ -149,7 +71,7 @@ modest_account_mgr_get_type (void) if (!my_type) { static const GTypeInfo my_info = { sizeof (ModestAccountMgrClass), - NULL, /* base init */ + modest_account_mgr_base_init, /* base init */ NULL, /* base finalize */ (GClassInitFunc) modest_account_mgr_class_init, NULL, /* class finalize */ @@ -167,6 +89,71 @@ modest_account_mgr_get_type (void) return my_type; } +static void +modest_account_mgr_base_init (gpointer g_class) +{ + static gboolean modest_account_mgr_initialized = FALSE; + + if (!modest_account_mgr_initialized) { + /* signal definitions */ + signals[ACCOUNT_INSERTED_SIGNAL] = + g_signal_new ("account_inserted", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, account_inserted), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + + signals[ACCOUNT_REMOVED_SIGNAL] = + g_signal_new ("account_removed", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, account_removed), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + + signals[ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("account_changed", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, account_changed), + NULL, NULL, + modest_marshal_VOID__STRING_INT, + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); + + signals[ACCOUNT_BUSY_SIGNAL] = + g_signal_new ("account_busy_changed", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, account_busy_changed), + NULL, NULL, + modest_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN); + + signals[DEFAULT_ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("default_account_changed", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, default_account_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[DISPLAY_NAME_CHANGED_SIGNAL] = + g_signal_new ("display_name_changed", + MODEST_TYPE_ACCOUNT_MGR, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestAccountMgrClass, display_name_changed), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + + modest_account_mgr_initialized = TRUE; + } +} + static void modest_account_mgr_class_init (ModestAccountMgrClass * klass) { @@ -178,32 +165,6 @@ modest_account_mgr_class_init (ModestAccountMgrClass * klass) 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_POINTER_BOOLEAN, - G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); - signals[ACCOUNT_BUSY_SIGNAL] = - g_signal_new ("account_busy_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestAccountMgrClass,account_busy_changed), - NULL, NULL, - modest_marshal_VOID__STRING_BOOLEAN, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN); } @@ -213,9 +174,26 @@ modest_account_mgr_init (ModestAccountMgr * obj) ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); - priv->modest_conf = NULL; + priv->modest_conf = NULL; priv->busy_accounts = NULL; - priv->timeout = g_timeout_add (1000 /* milliseconds */, on_timeout_notify_changes, obj); + priv->timeout = 0; + + priv->notification_id_accounts = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free); + + /* we maintain hashes for the modest-conf keys we build from account name + * + key. many seem to be used often, and generating them showed up high + * in oprofile */ + /* both hashes are hashes to hashes; + * account-key => keyname ==> account-key-name + */ + priv->server_account_key_hash = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify)g_hash_table_destroy); + priv->account_key_hash = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify)g_hash_table_destroy); } static void @@ -224,23 +202,29 @@ modest_account_mgr_finalize (GObject * obj) ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); - if (priv->key_changed_handler_uid) { - g_signal_handler_disconnect (priv->modest_conf, - priv->key_changed_handler_uid); - priv->key_changed_handler_uid = 0; + if (priv->notification_id_accounts) { + /* TODO: forget dirs */ + + g_hash_table_destroy (priv->notification_id_accounts); } if (priv->modest_conf) { g_object_unref (G_OBJECT(priv->modest_conf)); priv->modest_conf = NULL; } - + if (priv->timeout) g_source_remove (priv->timeout); - - if (priv->changed_conf_keys) { - g_slist_foreach (priv->changed_conf_keys, (GFunc) g_free, NULL); - g_slist_free (priv->changed_conf_keys); + priv->timeout = 0; + + if (priv->server_account_key_hash) { + g_hash_table_destroy (priv->server_account_key_hash); + priv->server_account_key_hash = NULL; + } + + if (priv->account_key_hash) { + g_hash_table_destroy (priv->account_key_hash); + priv->account_key_hash = NULL; } G_OBJECT_CLASS(parent_class)->finalize (obj); @@ -261,11 +245,6 @@ modest_account_mgr_new (ModestConf *conf) g_object_ref (G_OBJECT(conf)); priv->modest_conf = conf; - priv->key_changed_handler_uid = - g_signal_connect (G_OBJECT (conf), "key_changed", - G_CALLBACK (on_key_change), - obj); - return MODEST_ACCOUNT_MGR (obj); } @@ -280,12 +259,16 @@ null_means_empty (const gchar * str) gboolean modest_account_mgr_add_account (ModestAccountMgr *self, const gchar *name, + const gchar *display_name, + const gchar *user_fullname, + const gchar *user_email, + const gchar *retrieve_type, const gchar *store_account, const gchar *transport_account, gboolean enabled) { ModestAccountMgrPrivate *priv; - gchar *key; + const gchar *key; gboolean ok; gchar *default_account; GError *err = NULL; @@ -300,15 +283,14 @@ 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 = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_DISPLAY_NAME, + FALSE); if (modest_account_mgr_account_exists (self, key, FALSE)) { 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); if (!ok) { g_printerr ("modest: cannot set display name\n"); if (err) { @@ -319,12 +301,12 @@ modest_account_mgr_add_account (ModestAccountMgr *self, } if (store_account) { - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); + key = _modest_account_mgr_get_account_keyname_cached (priv, 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); + store_account); if (err) { g_printerr ("modest: Error adding store account conf: %s\n", err->message); g_error_free (err); @@ -334,10 +316,10 @@ modest_account_mgr_add_account (ModestAccountMgr *self, } if (transport_account) { - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, - FALSE); + key = _modest_account_mgr_get_account_keyname_cached (priv, 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); @@ -352,33 +334,53 @@ modest_account_mgr_add_account (ModestAccountMgr *self, /* Make sure that leave-messages-on-server is enabled by default, * as per the UI spec, though it is only meaningful for accounts using POP. * (possibly this gconf key should be under the server account): */ - modest_account_mgr_set_bool (self, name, - MODEST_ACCOUNT_LEAVE_ON_SERVER, TRUE, FALSE /* not server account */); - - - modest_account_mgr_set_enabled (self, name, enabled); + modest_account_mgr_set_bool (self, name, MODEST_ACCOUNT_LEAVE_ON_SERVER, TRUE, FALSE); + modest_account_mgr_set_bool (self, name, MODEST_ACCOUNT_ENABLED, enabled,FALSE); + + /* Fill other data */ + modest_account_mgr_set_string (self, name, + MODEST_ACCOUNT_DISPLAY_NAME, + display_name, FALSE); + modest_account_mgr_set_string (self, name, + MODEST_ACCOUNT_FULLNAME, + user_fullname, FALSE); + modest_account_mgr_set_string (self, name, + MODEST_ACCOUNT_EMAIL, + user_email, FALSE); + modest_account_mgr_set_string (self, name, + MODEST_ACCOUNT_RETRIEVE, + retrieve_type, FALSE); + + /* Notify the observers */ + g_signal_emit (self, signals[ACCOUNT_INSERTED_SIGNAL], 0, name); /* if no default account has been defined yet, do so now */ default_account = modest_account_mgr_get_default_account (self); if (!default_account) modest_account_mgr_set_default_account (self, name); g_free (default_account); - + + /* (re)set the automatic account update */ + modest_platform_set_update_interval + (modest_conf_get_int (priv->modest_conf, MODEST_CONF_UPDATE_INTERVAL, NULL)); + return TRUE; } gboolean modest_account_mgr_add_server_account (ModestAccountMgr * self, - const gchar * name, const gchar *hostname, + const gchar *name, + const gchar *hostname, guint portnumber, - const gchar * username, const gchar * password, + const gchar *username, + const gchar *password, ModestTransportStoreProtocol proto, ModestConnectionProtocol security, ModestAuthProtocol auth) { ModestAccountMgrPrivate *priv; - gchar *key; + const gchar *key; gboolean ok = TRUE; GError *err = NULL; @@ -389,10 +391,9 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); /* hostname */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_HOSTNAME, TRUE); if (modest_conf_key_exists (priv->modest_conf, key, &err)) { g_printerr ("modest: server account '%s' already exists\n", name); - g_free (key); ok = FALSE; } if (!ok) @@ -404,37 +405,34 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* username */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_USERNAME, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_USERNAME, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (username), &err); if (err) { g_printerr ("modest: failed to set %s: %s\n", key, err->message); g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* password */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PASSWORD, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PASSWORD, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, null_means_empty (password), &err); if (err) { g_printerr ("modest: failed to set %s: %s\n", key, err->message); g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* proto */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PROTO, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, modest_protocol_info_get_transport_store_protocol_name(proto), &err); @@ -443,26 +441,24 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* portnumber */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PORT, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PORT, TRUE); ok = modest_conf_set_int (priv->modest_conf, key, portnumber, &err); if (err) { g_printerr ("modest: failed to set %s: %s\n", key, err->message); g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* auth mechanism */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_AUTH_MECH, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_AUTH_MECH, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, modest_protocol_info_get_auth_protocol_name (auth), &err); @@ -471,12 +467,11 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, g_error_free (err); ok = FALSE; } - g_free (key); if (!ok) goto cleanup; /* Add the security settings: */ - modest_server_account_set_security (self, name, security); + modest_account_mgr_set_server_account_security (self, name, security); cleanup: if (!ok) { @@ -492,11 +487,12 @@ cleanup: */ gboolean modest_account_mgr_add_server_account_uri (ModestAccountMgr * self, - const gchar *name, ModestTransportStoreProtocol proto, + const gchar *name, + ModestTransportStoreProtocol proto, const gchar *uri) { ModestAccountMgrPrivate *priv; - gchar *key; + const gchar *key; gboolean ok; g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE); @@ -506,13 +502,11 @@ modest_account_mgr_add_server_account_uri (ModestAccountMgr * self, priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - /* proto */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_PROTO, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_PROTO, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, modest_protocol_info_get_transport_store_protocol_name(proto), NULL); - g_free (key); if (!ok) { g_printerr ("modest: failed to set proto\n"); @@ -520,9 +514,8 @@ modest_account_mgr_add_server_account_uri (ModestAccountMgr * self, } /* uri */ - key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_URI, TRUE); + key = _modest_account_mgr_get_account_keyname_cached (priv, name, MODEST_ACCOUNT_URI, TRUE); ok = modest_conf_set_string (priv->modest_conf, key, uri, NULL); - g_free (key); if (!ok) { g_printerr ("modest: failed to set uri\n"); @@ -531,68 +524,67 @@ modest_account_mgr_add_server_account_uri (ModestAccountMgr * self, return TRUE; } +/* + * Utility function used by modest_account_mgr_remove_account + */ +static void +real_remove_account (ModestConf *conf, + const gchar *acc_name, + gboolean server_account) +{ + GError *err = NULL; + gchar *key; + + key = _modest_account_mgr_get_account_keyname (acc_name, NULL, server_account); + modest_conf_remove_key (conf, key, &err); + + if (err) { + g_printerr ("modest: error removing key: %s\n", err->message); + g_error_free (err); + } + g_free (key); +} + gboolean modest_account_mgr_remove_account (ModestAccountMgr * self, - const gchar* name, gboolean server_account) + const gchar* name) { ModestAccountMgrPrivate *priv; - gchar *key; - gboolean retval, default_account_deleted; - GError *err = NULL; + gchar *default_account_name, *store_acc_name, *transport_acc_name; + gboolean default_account_deleted; g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE); g_return_val_if_fail (name, FALSE); - if (!modest_account_mgr_account_exists (self, name, server_account)) { + if (!modest_account_mgr_account_exists (self, name, FALSE)) { g_printerr ("modest: %s: account '%s' does not exist\n", __FUNCTION__, name); return FALSE; } + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); default_account_deleted = FALSE; - if (!server_account) { - gchar *server_account_name, *default_account_name; - - /* If this was the default, then remove that setting: */ - default_account_name = modest_account_mgr_get_default_account (self); - if (default_account_name && (strcmp (default_account_name, name) == 0)) { - modest_account_mgr_unset_default_account (self); - default_account_deleted = TRUE; - } - g_free (default_account_name); - - /* in case we're deleting an account, also delete the dependent store and transport account */ - server_account_name = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_STORE_ACCOUNT, - FALSE); - if (server_account_name) { - if (!modest_account_mgr_remove_account (self, server_account_name, TRUE)) - g_printerr ("modest: failed to remove store account '%s' (%s)\n", - server_account_name, name); - g_free (server_account_name); - } else - g_printerr ("modest: could not find the store account for %s\n", name); - - server_account_name = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, - FALSE); - if (server_account_name) { - if (!modest_account_mgr_remove_account (self, server_account_name, TRUE)) - g_printerr ("modest: failed to remove transport account '%s' (%s)\n", - server_account_name, name); - g_free (server_account_name); - } else - g_printerr ("modest: could not find the transport account for %s\n", name); + /* If this was the default, then remove that setting: */ + default_account_name = modest_account_mgr_get_default_account (self); + if (default_account_name && (strcmp (default_account_name, name) == 0)) { + modest_account_mgr_unset_default_account (self); + default_account_deleted = TRUE; } + g_free (default_account_name); + + /* Delete transport and store accounts */ + store_acc_name = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_STORE_ACCOUNT, FALSE); + if (store_acc_name) + real_remove_account (priv->modest_conf, store_acc_name, TRUE); + + transport_acc_name = modest_account_mgr_get_string (self, name, + MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE); + if (transport_acc_name) + real_remove_account (priv->modest_conf, transport_acc_name, TRUE); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - key = _modest_account_mgr_get_account_keyname (name, NULL, server_account); - - retval = modest_conf_remove_key (priv->modest_conf, key, &err); - g_free (key); - - if (err) { - g_printerr ("modest: error removing key: %s\n", err->message); - g_error_free (err); - } + /* Remove the modest account */ + real_remove_account (priv->modest_conf, name, FALSE); if (default_account_deleted) { /* pick another one as the new default account. We do @@ -601,16 +593,21 @@ modest_account_mgr_remove_account (ModestAccountMgr * self, deleted account */ modest_account_mgr_set_first_account_as_default (self); } - - if (server_account) { - /* Notify the observers. We do this *after* deleting - the keys, because otherwise a call to account_names - will retrieve also the deleted account */ - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, - name, server_account); - } - - return retval; + + /* Notify the observers. We do this *after* deleting + the keys, because otherwise a call to account_names + will retrieve also the deleted account */ + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_REMOVED_SIGNAL], 0, name); + + /* if this was the last account, stop any auto-updating */ + /* (re)set the automatic account update */ + GSList *acc_names = modest_account_mgr_account_names (self, TRUE); + if (!acc_names) + modest_platform_set_update_interval (0); + else + modest_account_mgr_free_account_names (acc_names); + + return TRUE; } @@ -671,9 +668,9 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled gboolean add = TRUE; if (only_enabled) { if (unescaped_name && - !modest_account_mgr_get_enabled (self, unescaped_name)) { + !modest_account_mgr_get_bool (self, unescaped_name, + MODEST_ACCOUNT_ENABLED, FALSE)) add = FALSE; - } } /* Ignore modest accounts whose server accounts don't exist: @@ -682,8 +679,9 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled * parent modest account already exists. */ if (add) { - gchar* server_account_name = modest_account_mgr_get_string (self, account_name_key, MODEST_ACCOUNT_STORE_ACCOUNT, - FALSE); + gchar* server_account_name = modest_account_mgr_get_string + (self, account_name_key, MODEST_ACCOUNT_STORE_ACCOUNT, + FALSE); if (server_account_name) { if (!modest_account_mgr_account_exists (self, server_account_name, TRUE)) add = FALSE; @@ -692,8 +690,9 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled } if (add) { - gchar* server_account_name = modest_account_mgr_get_string (self, account_name_key, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, - FALSE); + gchar* server_account_name = modest_account_mgr_get_string + (self, account_name_key, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, + FALSE); if (server_account_name) { if (!modest_account_mgr_account_exists (self, server_account_name, TRUE)) add = FALSE; @@ -701,7 +700,7 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled } } - if (add) + if (add) result = g_slist_append (result, unescaped_name); else g_free (unescaped_name); @@ -736,7 +735,7 @@ modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gchar *retval; GError *err = NULL; @@ -744,7 +743,9 @@ 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 = _modest_account_mgr_get_account_keyname (name, key, server_account); + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); retval = modest_conf_get_string (priv->modest_conf, keyname, &err); @@ -753,29 +754,18 @@ modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, g_error_free (err); retval = NULL; } - g_free (keyname); return retval; } -gchar * -modest_account_mgr_get_password (ModestAccountMgr *self, const gchar *name, - const gchar *key, gboolean server_account) -{ - return modest_account_mgr_get_string (self, name, key, server_account); - -} - - - gint modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, const gchar *key, gboolean server_account) { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gint retval; GError *err = NULL; @@ -783,16 +773,16 @@ modest_account_mgr_get_int (ModestAccountMgr *self, const gchar *name, const gch g_return_val_if_fail (name, -1); g_return_val_if_fail (key, -1); - keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_get_int (priv->modest_conf, keyname, &err); if (err) { g_printerr ("modest: error getting int '%s': %s\n", keyname, err->message); g_error_free (err); retval = -1; } - g_free (keyname); return retval; } @@ -805,7 +795,7 @@ modest_account_mgr_get_bool (ModestAccountMgr * self, const gchar *account, { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; @@ -813,16 +803,17 @@ 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 = _modest_account_mgr_get_account_keyname (account, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + ///keyname = _modest_account_mgr_get_account_keyname (account, key, server_account); + + keyname = _modest_account_mgr_get_account_keyname_cached (priv, account, key, server_account); + retval = modest_conf_get_bool (priv->modest_conf, keyname, &err); if (err) { g_printerr ("modest: error getting bool '%s': %s\n", keyname, err->message); g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } @@ -834,19 +825,21 @@ modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name, const gchar *key, ModestConfValueType list_type, gboolean server_account) { - ModestAccountMgrPrivate *priv; + ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - gchar *keyname; + const gchar *keyname; GSList *retval; GError *err = NULL; g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), NULL); g_return_val_if_fail (name, NULL); g_return_val_if_fail (key, NULL); - - keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, + server_account); + retval = modest_conf_get_list (priv->modest_conf, keyname, list_type, &err); if (err) { g_printerr ("modest: error getting list '%s': %s\n", keyname, @@ -854,19 +847,20 @@ modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name, g_error_free (err); retval = FALSE; } - g_free (keyname); - return retval; } gboolean -modest_account_mgr_set_string (ModestAccountMgr * self, const gchar * name, - const gchar * key, const gchar * val, gboolean server_account) +modest_account_mgr_set_string (ModestAccountMgr * self, + const gchar * name, + const gchar * key, + const gchar * val, + gboolean server_account) { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; @@ -874,37 +868,26 @@ 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 = _modest_account_mgr_get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_set_string (priv->modest_conf, keyname, val, &err); if (err) { g_printerr ("modest: error setting string '%s': %s\n", keyname, err->message); g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } - -gboolean -modest_account_mgr_set_password (ModestAccountMgr * self, const gchar * name, - const gchar * key, const gchar * val, gboolean server_account) -{ - return modest_account_mgr_set_password (self, name, key, val, server_account); -} - - - gboolean modest_account_mgr_set_int (ModestAccountMgr * self, const gchar * name, const gchar * key, int val, gboolean server_account) { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; @@ -912,17 +895,16 @@ 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 = _modest_account_mgr_get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_set_int (priv->modest_conf, keyname, val, &err); if (err) { g_printerr ("modest: error setting int '%s': %s\n", keyname, err->message); g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } @@ -934,7 +916,7 @@ modest_account_mgr_set_bool (ModestAccountMgr * self, const gchar * name, { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; @@ -942,17 +924,16 @@ 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 = _modest_account_mgr_get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_set_bool (priv->modest_conf, keyname, val, &err); if (err) { g_printerr ("modest: error setting bool '%s': %s\n", keyname, err->message); g_error_free (err); retval = FALSE; } - g_free (keyname); + return retval; } @@ -966,7 +947,7 @@ modest_account_mgr_set_list (ModestAccountMgr *self, gboolean server_account) { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; GError *err = NULL; gboolean retval; @@ -975,35 +956,35 @@ modest_account_mgr_set_list (ModestAccountMgr *self, g_return_val_if_fail (key, FALSE); g_return_val_if_fail (val, FALSE); - keyname = _modest_account_mgr_get_account_keyname (name, key, server_account); - priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_set_list (priv->modest_conf, keyname, val, list_type, &err); if (err) { g_printerr ("modest: error setting list '%s': %s\n", keyname, err->message); g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } gboolean -modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, +modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar* name, gboolean server_account) { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; - g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE); + g_return_val_if_fail (self, FALSE); g_return_val_if_fail (name, FALSE); - keyname = _modest_account_mgr_get_account_keyname (name, NULL, server_account); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, NULL, server_account); retval = modest_conf_key_exists (priv->modest_conf, keyname, &err); if (err) { g_printerr ("modest: error determining existance of '%s': %s\n", keyname, @@ -1011,12 +992,12 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } gboolean -modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, const gchar *display_name) +modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, + const gchar *display_name) { GSList *account_names = NULL; GSList *cursor = NULL; @@ -1059,7 +1040,7 @@ modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, { ModestAccountMgrPrivate *priv; - gchar *keyname; + const gchar *keyname; gboolean retval; GError *err = NULL; @@ -1067,9 +1048,9 @@ modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, 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); + keyname = _modest_account_mgr_get_account_keyname_cached (priv, name, key, server_account); + retval = modest_conf_remove_key (priv->modest_conf, keyname, &err); if (err) { g_printerr ("modest: error unsetting'%s': %s\n", keyname, @@ -1077,7 +1058,6 @@ modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, g_error_free (err); retval = FALSE; } - g_free (keyname); return retval; } @@ -1137,20 +1117,49 @@ _modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key + + +/* optimization: only with non-alphanum chars, escaping is needed */ +inline static gboolean +is_alphanum (const gchar* str) +{ + const gchar *cursor; + for (cursor = str; cursor && *cursor; ++cursor) { + const char c = *cursor; + /* we cannot trust isalnum(3), because it might consider locales */ + /* numbers ALPHA alpha */ + if (!((c>=48 && c<=57)||(c>=65 && c<=90)||(c>=97 && c<=122))) + return FALSE; + } + return TRUE; +} + + + + /* must be freed by caller */ gchar * -_modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account) +_modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar* name, + gboolean server_account) { - gchar *retval = NULL; - + gchar *retval = NULL; gchar *namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + gchar *escaped_account_name, *escaped_name; if (!account_name) return g_strdup (namespace); + + /* optimization: only escape names when need to be escaped */ + if (is_alphanum (account_name)) + escaped_account_name = (gchar*)account_name; + else + escaped_account_name = modest_conf_key_escape (account_name); - /* Always escape the conf keys, so that it is acceptable to gconf: */ - gchar *escaped_account_name = account_name ? modest_conf_key_escape (account_name) : NULL; - gchar *escaped_name = name ? modest_conf_key_escape (name) : NULL; + if (is_alphanum (name)) + escaped_name = (gchar*)name; + else + escaped_name = modest_conf_key_escape (name); + ////////////////////////////////////////////////////////////// if (escaped_account_name && escaped_name) retval = g_strconcat (namespace, "/", escaped_account_name, "/", escaped_name, NULL); @@ -1163,13 +1172,52 @@ _modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar g_free (retval); retval = NULL; } - - g_free (escaped_name); - g_free (escaped_account_name); + + /* g_free is only needed if we actually allocated anything */ + if (name != escaped_name) + g_free (escaped_name); + if (account_name != escaped_account_name) + g_free (escaped_account_name); return retval; } +static const gchar * +_modest_account_mgr_get_account_keyname_cached (ModestAccountMgrPrivate *priv, + const gchar* account_name, + const gchar *name, + gboolean is_server) +{ + GHashTable *hash = is_server ? priv->server_account_key_hash : priv->account_key_hash; + GHashTable *account_hash; + gchar *key = NULL; + const gchar *search_name; + + if (!account_name) + return is_server ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + + search_name = name ? name : ""; + + account_hash = g_hash_table_lookup (hash, account_name); + if (!account_hash) { /* no hash for this account yet? create it */ + account_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + key = _modest_account_mgr_get_account_keyname (account_name, name, is_server); + g_hash_table_insert (account_hash, g_strdup(search_name), key); + g_hash_table_insert (hash, g_strdup(account_name), account_hash); + return key; + } + + /* we have a hash for this account, but do we have the key? */ + key = g_hash_table_lookup (account_hash, search_name); + if (!key) { + key = _modest_account_mgr_get_account_keyname (account_name, name, is_server); + g_hash_table_insert (account_hash, g_strdup(search_name), key); + } + + return key; +} + + gboolean modest_account_mgr_has_accounts (ModestAccountMgr* self, gboolean enabled) { @@ -1193,40 +1241,171 @@ compare_account_name(gconstpointer a, gconstpointer b) } void -modest_account_mgr_set_account_busy(ModestAccountMgr* self, const gchar* account_name, - gboolean busy) +modest_account_mgr_set_account_busy(ModestAccountMgr* self, + const gchar* account_name, + gboolean busy) { - ModestAccountMgrPrivate* priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - if (busy) - { - GSList *account_names = modest_account_mgr_account_names (self, - TRUE); - GSList* account = - g_slist_find_custom(account_names, account_name, (GCompareFunc) compare_account_name); - if (account && !modest_account_mgr_account_is_busy(self, account_name)) - { + ModestAccountMgrPrivate* priv; + + g_return_if_fail (MODEST_IS_ACCOUNT_MGR(self)); + g_return_if_fail (account_name); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + if (busy) { + GSList *account_names = modest_account_mgr_account_names (self, TRUE); + GSList* account = g_slist_find_custom(account_names, account_name, + (GCompareFunc) compare_account_name); + + if (account && !modest_account_mgr_account_is_busy(self, account_name)) { priv->busy_accounts = g_slist_append(priv->busy_accounts, g_strdup(account_name)); - g_signal_emit_by_name(G_OBJECT(self), "account-busy-changed", account_name, TRUE); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_BUSY_SIGNAL], + 0, account_name, TRUE); } modest_account_mgr_free_account_names (account_names); account_names = NULL; } else { GSList* account = g_slist_find_custom(priv->busy_accounts, account_name, (GCompareFunc) compare_account_name); - if (account) - { + + if (account) { g_free(account->data); priv->busy_accounts = g_slist_delete_link(priv->busy_accounts, account); - g_signal_emit_by_name(G_OBJECT(self), "account-busy-changed", account_name, FALSE); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_BUSY_SIGNAL], + 0, account_name, FALSE); } } } gboolean -modest_account_mgr_account_is_busy(ModestAccountMgr* self, const gchar* account_name) +modest_account_mgr_account_is_busy (ModestAccountMgr* self, const gchar* account_name) { - ModestAccountMgrPrivate* priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + ModestAccountMgrPrivate* priv; + + g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(self), FALSE); + g_return_val_if_fail (account_name, FALSE); + + priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + return (g_slist_find_custom(priv->busy_accounts, account_name, (GCompareFunc) compare_account_name) - != NULL); + != NULL); +} + +void +modest_account_mgr_notify_account_update (ModestAccountMgr* self, + const gchar *server_account_name) +{ + ModestTransportStoreProtocol proto; + gchar *proto_name = NULL; + + /* Get protocol */ + proto_name = modest_account_mgr_get_string (self, server_account_name, + MODEST_ACCOUNT_PROTO, TRUE); + if (!proto_name) { + g_free (proto_name); + g_return_if_reached (); + } + proto = modest_protocol_info_get_transport_store_protocol (proto_name); + g_free (proto_name); + + /* Emit "update-account" */ + g_signal_emit (G_OBJECT(self), + signals[ACCOUNT_CHANGED_SIGNAL], 0, + server_account_name, + (modest_protocol_info_protocol_is_store (proto)) ? + TNY_ACCOUNT_TYPE_STORE : + TNY_ACCOUNT_TYPE_TRANSPORT); +} + + +gboolean +modest_account_mgr_set_default_account (ModestAccountMgr *self, const gchar* account) +{ + ModestConf *conf; + gboolean retval; + + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (account, FALSE); + g_return_val_if_fail (modest_account_mgr_account_exists (self, account, FALSE), + FALSE); + + conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf; + + /* Change the default account and notify */ + retval = modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, account, NULL); + if (retval) + g_signal_emit (G_OBJECT(self), signals[DEFAULT_ACCOUNT_CHANGED_SIGNAL], 0); + + return retval; } + + +gchar* +modest_account_mgr_get_default_account (ModestAccountMgr *self) +{ + gchar *account; + ModestConf *conf; + GError *err = NULL; + + g_return_val_if_fail (self, NULL); + + conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf; + account = modest_conf_get_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, &err); + if (err) { + g_printerr ("modest: failed to get '%s': %s\n", + MODEST_CONF_DEFAULT_ACCOUNT, err->message); + g_error_free (err); + g_free (account); + return NULL; + } + + /* sanity check */ + if (account && !modest_account_mgr_account_exists (self, account, FALSE)) { + g_printerr ("modest: default account does not exist\n"); + g_free (account); + return NULL; + } + + return account; +} + +static gboolean +modest_account_mgr_unset_default_account (ModestAccountMgr *self) +{ + ModestConf *conf; + gboolean retval; + + g_return_val_if_fail (self, FALSE); + + conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf; + + retval = modest_conf_remove_key (conf, MODEST_CONF_DEFAULT_ACCOUNT, NULL /* err */); + + if (retval) + g_signal_emit (G_OBJECT(self), signals[DEFAULT_ACCOUNT_CHANGED_SIGNAL], 0); + + return retval; +} + + +gchar* +modest_account_mgr_get_display_name (ModestAccountMgr *self, + const gchar* name) +{ + return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_DISPLAY_NAME, FALSE); +} + +void +modest_account_mgr_set_display_name (ModestAccountMgr *self, + const gchar *account_name, + const gchar *display_name) +{ + modest_account_mgr_set_string (self, + account_name, + MODEST_ACCOUNT_DISPLAY_NAME, + display_name, + FALSE /* not server account */); + + /* Notify about the change in the display name */ + g_signal_emit (self, signals[DISPLAY_NAME_CHANGED_SIGNAL], 0, account_name); +}