}
gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self,
- const gchar* account_name,
const gchar* connection_name, const gchar* server_account_name)
{
- modest_account_mgr_remove_connection_specific_smtp (self, account_name, connection_name);
+ modest_account_mgr_remove_connection_specific_smtp (self, connection_name);
- GSList *list = modest_account_mgr_get_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, FALSE);
-
- /* The server account is in the item after the connection name: */
- GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
- list_connection = g_slist_append (list_connection, (gpointer)server_account_name);
-
- /* Reset the changed list: */
- modest_account_mgr_set_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
- MODEST_CONF_VALUE_STRING, FALSE);
+ ModestConf *conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
+
+ gboolean result = TRUE;
+ GError *err = NULL;
+ GSList *list = modest_conf_get_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: %s: error getting list: %s.\n", __FUNCTION__, err->message);
+ g_error_free (err);
+ err = NULL;
+ result = FALSE;
+ } else {
+ /* The server account is in the item after the connection name: */
+ GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
+ list_connection = g_slist_append (list_connection, (gpointer)server_account_name);
+
+ /* Reset the changed list: */
+ modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
+ MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: %s: error setting list: %s.\n", __FUNCTION__, err->message);
+ g_error_free (err);
+ result = FALSE;
+ }
+ }
/* TODO: Should we free the items too, or just the list? */
g_slist_free (list);
- return TRUE;
+ return result;
}
/**
* Returns: TRUE if it worked, FALSE otherwise
*/
gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self,
- const gchar* account_name, const gchar* connection_name)
+ const gchar* connection_name)
{
- GSList *list = modest_account_mgr_get_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, FALSE);
+ ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+ gboolean result = TRUE;
+ GError *err = NULL;
+ GSList *list = modest_conf_get_list (priv->modest_conf,
+ MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: %s: error getting list: %s.\n", __FUNCTION__, err->message);
+ g_error_free (err);
+ err = NULL;
+ result = FALSE;
+ }
+
if (!list)
return FALSE;
}
/* Reset the changed list: */
- modest_account_mgr_set_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
- MODEST_CONF_VALUE_STRING, FALSE);
+ modest_conf_set_list (priv->modest_conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list,
+ MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: %s: error setting list: %s.\n", __FUNCTION__, err->message);
+ g_error_free (err);
+ result = FALSE;
+ }
/* TODO: Should we free the items too, or just the list? */
g_slist_free (list);
- return TRUE;
+ return result;
}
-gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name)
+
+gboolean modest_account_mgr_get_use_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name)
{
- GSList *list = modest_account_mgr_get_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, FALSE);
- if (!list)
- return FALSE;
-
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (list);
-
- return TRUE;
+ return modest_account_mgr_get_bool (self, account_name,
+ MODEST_ACCOUNT_USE_CONNECTION_SPECIFIC_SMTP, FALSE);
+}
+
+gboolean modest_account_mgr_set_use_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name,
+ gboolean new_value)
+{
+ return modest_account_mgr_set_bool (self, account_name, MODEST_ACCOUNT_USE_CONNECTION_SPECIFIC_SMTP,
+ new_value, FALSE);
}
/**
* modest_account_mgr_get_connection_specific_smtp
* @self: a ModestAccountMgr instance
- * @name: the account name
* @connection_name: A libconic IAP connection name
*
* Retrieve a server account to use with this specific connection for this account.
*
* Returns: a server account name to use for this connection, or NULL if none is specified.
*/
-gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name,
- const gchar* connection_name)
+gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self, const gchar* connection_name)
{
gchar *result = NULL;
- GSList *list = modest_account_mgr_get_list (self, account_name,
- MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
- MODEST_CONF_VALUE_STRING, FALSE);
+ ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
+
+ GError *err = NULL;
+ GSList *list = modest_conf_get_list (priv->modest_conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, &err);
+ if (err) {
+ g_printerr ("modest: %s: error getting list: %s.\n", __FUNCTION__, err->message);
+ g_error_free (err);
+ err = NULL;
+ }
+
if (!list)
return NULL;
conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
- return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
- account, NULL);
-
+ return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, account, NULL);
}
gboolean
return g_utf8_collate((const gchar*)a, (const gchar*)b);
}
-gboolean
-modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+/** Get the first one, alphabetically, by title. */
+gchar*
+modest_account_mgr_get_first_account_name (ModestAccountMgr *self)
{
- gchar *old_default;
- gboolean result = FALSE, found;
- GSList* list_sorted, *iter;
const gchar* account_name = NULL;
GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
/* Return TRUE if there is no account */
if (!account_names)
- return TRUE;
-
+ return NULL;
+
/* Get the first one, alphabetically, by title: */
- old_default = modest_account_mgr_get_default_account (self);
- list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
+ /* gchar *old_default = modest_account_mgr_get_default_account (self); */
+ GSList* list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
- iter = list_sorted;
- found = FALSE;
+ GSList* iter = list_sorted;
+ gboolean found = FALSE;
while (iter && !found) {
account_name = (const gchar*)list_sorted->data;
- if (old_default) {
- /* The new should be different than the old one */
- if (strcmp (old_default, account_name))
- found = TRUE;
- } else
+ if (account_name)
found = TRUE;
if (!found)
iter = g_slist_next (iter);
}
- if (found && account_name)
- result = modest_account_mgr_set_default_account (self, account_name);
-
+ gchar* result = NULL;
+ if (account_name)
+ result = g_strdup (account_name);
+
modest_account_mgr_free_account_names (account_names);
account_names = NULL;
return result;
}
+gboolean
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
+{
+ gboolean result = FALSE;
+
+ gchar* account_name = modest_account_mgr_get_first_account_name(self);
+ if (account_name) {
+ result = modest_account_mgr_set_default_account (self, account_name);
+ g_free (account_name);
+ }
+ else
+ result = TRUE; /* If there are no accounts then it's not a failure. */
+
+ return result;
+}
+
gchar*
modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name)
{