X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=624bff066d9de0d971dd0569ed82979a73d29756;hp=d1a83a0bab68d09696ed6323e2dc15422444fe58;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=fd382dbc5face5a3cf26d4e9b3fa2f78b3afce4c diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index d1a83a0..624bff0 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -37,101 +37,109 @@ 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); /* list my signals */ enum { + ACCOUNT_INSERTED_SIGNAL, ACCOUNT_CHANGED_SIGNAL, ACCOUNT_REMOVED_SIGNAL, + ACCOUNT_BUSY_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. */ +/* /\* 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); +/* if (priv->changed_conf_keys) { */ +/* gchar *default_account = */ +/* modest_account_mgr_get_default_account (self); */ - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, - default_account, priv->changed_conf_keys, FALSE); +/* /\* 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_free (default_account); */ - g_slist_free (priv->changed_conf_keys); - priv->changed_conf_keys = NULL; - } +/* 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) -{ - /* printf("DEBUG: %s: key=%s\n", __FUNCTION__, key); */ - - ModestAccountMgr *self = MODEST_ACCOUNT_MGR (user_data); - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - - /* 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. */ +/* 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 (NULL, - (gpointer)key); - } - - gboolean is_account_key = FALSE; - gboolean is_server_account = FALSE; - gchar* account = _modest_account_mgr_account_from_key (key, &is_account_key, &is_server_account); +/* /\* 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)); */ +/* } */ - /* 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, - account, is_server_account); - 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)key); - } - - g_free (account); -} +/* 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 @@ -142,7 +150,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 */ @@ -160,6 +168,53 @@ 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_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", + 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); + + modest_account_mgr_initialized = TRUE; + } +} + static void modest_account_mgr_class_init (ModestAccountMgrClass * klass) { @@ -171,24 +226,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_STRING_BOOLEAN, - G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); } @@ -199,8 +236,9 @@ modest_account_mgr_init (ModestAccountMgr * obj) MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); priv->modest_conf = NULL; - - priv->timeout = g_timeout_add (1000 /* milliseconds */, on_timeout_notify_changes, obj); + priv->busy_accounts = NULL; + + priv->notification_id_accounts = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free); } static void @@ -209,16 +247,30 @@ modest_account_mgr_finalize (GObject * obj) ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (obj); + if (priv->notification_id_accounts) { + /* TODO: forget dirs */ + + g_hash_table_destroy (priv->notification_id_accounts); + } + + 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->modest_conf) { g_object_unref (G_OBJECT(priv->modest_conf)); priv->modest_conf = NULL; } - if (priv->timeout) - g_source_remove (priv->timeout); +/* if (priv->timeout) */ +/* g_source_remove (priv->timeout); */ - if (priv->changed_conf_keys) - g_slist_free (priv->changed_conf_keys); +/* if (priv->changed_conf_keys) { */ +/* g_slist_foreach (priv->changed_conf_keys, (GFunc) g_free, NULL); */ +/* g_slist_free (priv->changed_conf_keys); */ +/* } */ G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -238,9 +290,10 @@ modest_account_mgr_new (ModestConf *conf) g_object_ref (G_OBJECT(conf)); priv->modest_conf = conf; - g_signal_connect (G_OBJECT (conf), "key_changed", - G_CALLBACK (on_key_change), - obj); +/* priv->key_changed_handler_uid = */ +/* g_signal_connect (G_OBJECT (conf), "key_changed", */ +/* G_CALLBACK (on_key_change), */ +/* obj); */ return MODEST_ACCOUNT_MGR (obj); } @@ -271,7 +324,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self, g_return_val_if_fail (strchr(name, '/') == NULL, FALSE); priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); - + /* * we create the account by adding an account 'dir', with the name , * and in that the 'display_name' string key @@ -305,7 +358,6 @@ modest_account_mgr_add_account (ModestAccountMgr *self, g_printerr ("modest: Error adding store account conf: %s\n", err->message); g_error_free (err); } - return FALSE; } } @@ -335,18 +387,19 @@ modest_account_mgr_add_account (ModestAccountMgr *self, modest_account_mgr_set_enabled (self, name, enabled); + /* 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); - + return TRUE; } - - gboolean modest_account_mgr_add_server_account (ModestAccountMgr * self, const gchar * name, const gchar *hostname, @@ -360,13 +413,13 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self, gchar *key; gboolean ok = TRUE; GError *err = NULL; - + g_return_val_if_fail (MODEST_IS_ACCOUNT_MGR(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); - + /* hostname */ key = _modest_account_mgr_get_account_keyname (name, MODEST_ACCOUNT_HOSTNAME, TRUE); if (modest_conf_key_exists (priv->modest_conf, key, &err)) { @@ -510,70 +563,82 @@ 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 = NULL; + + key = _modest_account_mgr_get_account_keyname (acc_name, NULL, server_account); + modest_conf_remove_key (conf, key, &err); + g_free (key); + if (err) { + g_printerr ("modest: error removing key: %s\n", err->message); + g_error_free (err); + } +} gboolean modest_account_mgr_remove_account (ModestAccountMgr * self, - const gchar * name, gboolean server_account) + const gchar* name) { ModestAccountMgrPrivate *priv; - gchar *key; - gboolean retval; - 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; } - /* in case we're not deleting an account, also delete the dependent store and transport account */ - if (!server_account) { - gchar *server_account_name; - - 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); - } - 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); - } + default_account_deleted = FALSE; /* If this was the default, then remove that setting: */ - if (!server_account) { - gchar *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); - g_free (default_account_name); + 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); + + /* 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 + this *after* deleting the keys, because otherwise a + call to account_names will retrieve also the + deleted account */ + modest_account_mgr_set_first_account_as_default (self); } - 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); + + return TRUE; } @@ -593,58 +658,6 @@ strip_prefix_from_elements (GSList * lst, guint n) } } -#if 0 -/* Not used. */ -GSList* -modest_account_mgr_search_server_accounts (ModestAccountMgr * self, - const gchar * account_name, - ModestTransportStoreProtocol proto) -{ - GSList *accounts; - GSList *cursor; - ModestAccountMgrPrivate *priv; - gchar *key; - GError *err = NULL; - - g_return_val_if_fail (self, NULL); - - 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 */ - accounts = modest_conf_list_subkeys (priv->modest_conf, key, &err); - if (err) { - g_printerr ("modest: failed to get subkeys for '%s' (%s)\n", key, - err->message); - g_error_free(err); - return NULL; - } - - /* filter out the ones with the wrong protocol */ - /* we could optimize for unknown proto / unknown type, but it will only - * make the code more complex */ - cursor = accounts; - while (cursor) { - gchar *account = _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); - ModestTransportStoreProtocol this_proto = - modest_protocol_info_get_transport_store_protocol (acc_proto); - if (this_proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN && this_proto != proto) { - GSList *nxt = cursor->next; - accounts = g_slist_delete_link (accounts, cursor); - cursor = nxt; - } else - cursor = cursor->next; - - g_free (account); - g_free (acc_proto); - } - - /* +1 because we must remove the ending '/' as well */ - strip_prefix_from_elements (accounts, strlen(key)+1); - return accounts; -} -#endif GSList* modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled) @@ -658,9 +671,9 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled 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); + if (err) { g_printerr ("modest: failed to get subkeys (%s): %s\n", MODEST_ACCOUNT_NAMESPACE, err->message); @@ -679,11 +692,9 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled continue; const gchar* account_name_key = (const gchar*)iter->data; - /* printf ("DEBUG: %s: account_name_key=%s\n", __FUNCTION__, account_name_key); */ gchar* unescaped_name = account_name_key ? modest_conf_key_unescape (account_name_key) : NULL; - /* printf (" DEBUG: %s: unescaped name=%s\n", __FUNCTION__, unescaped_name); */ gboolean add = TRUE; if (only_enabled) { @@ -693,24 +704,60 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled } } - if (add) { - result = g_slist_append (result, unescaped_name); + /* Ignore modest accounts whose server accounts don't exist: + * (We could be getting this list while the account is being deleted, + * while the child server accounts have already been deleted, but the + * 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); + if (server_account_name) { + if (!modest_account_mgr_account_exists (self, server_account_name, TRUE)) + add = FALSE; + g_free (server_account_name); + } } - else { - g_free (unescaped_name); + + if (add) { + 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; + g_free (server_account_name); + } } - + + if (add) + result = g_slist_append (result, unescaped_name); + else + g_free (unescaped_name); + + g_free (iter->data); + iter->data = NULL; + iter = g_slist_next (iter); } - /* TODO: Free the strings too? */ + + /* we already freed the strings in the loop */ g_slist_free (accounts); + accounts = NULL; - return result; } +void +modest_account_mgr_free_account_names (GSList *account_names) +{ + g_slist_foreach (account_names, (GFunc)g_free, NULL); + g_slist_free (account_names); +} + + + gchar * modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name, const gchar *key, gboolean server_account) { @@ -984,7 +1031,6 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, 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); retval = modest_conf_key_exists (priv->modest_conf, keyname, &err); if (err) { @@ -997,14 +1043,14 @@ modest_account_mgr_account_exists (ModestAccountMgr * self, const gchar * name, return retval; } -gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, - const gchar *display_name) +gboolean +modest_account_mgr_account_with_display_name_exists (ModestAccountMgr *self, const gchar *display_name) { GSList *account_names = NULL; GSList *cursor = NULL; cursor = account_names = modest_account_mgr_account_names (self, - TRUE /* enabled accounts, because disabled accounts are not user visible. */); + TRUE /* enabled accounts, because disabled accounts are not user visible. */); gboolean found = FALSE; @@ -1026,7 +1072,8 @@ gboolean modest_account_mgr_account_with_display_name_exists (ModestAccountMgr modest_account_mgr_free_account_data (self, account_data); cursor = cursor->next; } - g_slist_free (account_names); + modest_account_mgr_free_account_names (account_names); + account_names = NULL; return found; } @@ -1061,3 +1108,153 @@ modest_account_mgr_unset (ModestAccountMgr *self, const gchar *name, g_free (keyname); return retval; } + +gchar* +_modest_account_mgr_account_from_key (const gchar *key, gboolean *is_account_key, gboolean *is_server_account) +{ + /* Initialize input parameters: */ + if (is_account_key) + *is_account_key = FALSE; + + if (is_server_account) + *is_server_account = FALSE; + + 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'; + + if (account) { + /* The key is an escaped string, so unescape it to get the actual account name: */ + gchar *unescaped_name = modest_conf_key_unescape (account); + g_free (account); + return unescaped_name; + } else + return NULL; +} + + + +/* must be freed by caller */ +gchar * +_modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar * name, gboolean server_account) +{ + gchar *retval = NULL; + + gchar *namespace = server_account ? MODEST_SERVER_ACCOUNT_NAMESPACE : MODEST_ACCOUNT_NAMESPACE; + + if (!account_name) + return g_strdup (namespace); + + /* 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 (escaped_account_name && escaped_name) + retval = g_strconcat (namespace, "/", escaped_account_name, "/", escaped_name, NULL); + else if (escaped_account_name) + retval = g_strconcat (namespace, "/", escaped_account_name, NULL); + + /* Sanity check: */ + if (!modest_conf_key_is_valid (retval)) { + g_warning ("%s: Generated conf key was invalid: %s", __FUNCTION__, retval); + g_free (retval); + retval = NULL; + } + + g_free (escaped_name); + g_free (escaped_account_name); + + return retval; +} + +gboolean +modest_account_mgr_has_accounts (ModestAccountMgr* self, gboolean enabled) +{ + /* Check that at least one account exists: */ + GSList *account_names = modest_account_mgr_account_names (self, + enabled); + gboolean accounts_exist = account_names != NULL; + + modest_account_mgr_free_account_names (account_names); + account_names = NULL; + + return accounts_exist; +} + +static int +compare_account_name(gconstpointer a, gconstpointer b) +{ + const gchar* account_name = (const gchar*) a; + const gchar* account_name2 = (const gchar*) b; + return strcmp(account_name, account_name2); +} + +void +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)) + { + 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); + } + 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) + { + 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); + } + } +} + +gboolean +modest_account_mgr_account_is_busy(ModestAccountMgr* self, const gchar* account_name) +{ + ModestAccountMgrPrivate* priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + return (g_slist_find_custom(priv->busy_accounts, account_name, (GCompareFunc) compare_account_name) + != NULL); +} +