}
-gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self,
- const gchar* connection_id, const gchar* server_account_name)
+gboolean
+modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self,
+ const gchar* connection_id,
+ const gchar* server_account_name)
{
modest_account_mgr_remove_connection_specific_smtp (self, connection_id);
result = FALSE;
} else {
/* The server account is in the item after the connection name: */
- list = g_slist_append (list, (gpointer)connection_id);
- list = g_slist_append (list, (gpointer)server_account_name);
+ list = g_slist_append (list, g_strdup (connection_id));
+ list = g_slist_append (list, g_strdup (server_account_name));
/* Reset the changed list: */
modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list,
}
}
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (list);
+ /* Free the list */
+ if (list) {
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
+ }
return result;
}
*
* Returns: TRUE if it worked, FALSE otherwise
*/
-gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self,
- const gchar* connection_id)
+gboolean
+modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *self,
+ const gchar* connection_id)
{
ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
result = FALSE;
}
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (list);
+ /* Free the list */
+ if (list) {
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
+ }
return result;
}
iter = g_slist_next (iter);
}
- /*
- if (!result) {
- printf (" debug: no server found for connection_id=%s.\n", connection_id);
+ /* Free the list */
+ if (list) {
+ g_slist_foreach (list, (GFunc) g_free, NULL);
+ g_slist_free (list);
}
- */
-
- /* TODO: Should we free the items too, or just the list? */
- g_slist_free (list);
return result;
}
modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY, str_value, TRUE);
}
-ModestServerAccountSettings*
+ModestServerAccountSettings *
modest_account_mgr_load_server_settings (ModestAccountMgr *self, const gchar* name, gboolean is_transport_and_not_store)
{
- ModestServerAccountSettings *settings;
+ ModestServerAccountSettings *settings = NULL;
ModestProtocol *protocol;
ModestProtocolRegistry *registry;
- gchar *string;
-
- g_return_val_if_fail (modest_account_mgr_account_exists (self, name, TRUE), NULL);
+ gchar *hostname, *username, *pwd, *uri, *proto, *auth, *sec;
+
+ if (!modest_account_mgr_account_exists (self, name, TRUE)) {
+ g_message ("%s account %s does not exist", __FUNCTION__, name);
+ return NULL;
+ }
+
registry = modest_runtime_get_protocol_registry ();
settings = modest_server_account_settings_new ();
modest_server_account_settings_set_account_name (settings, name);
- string = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_HOSTNAME,TRUE);
- modest_server_account_settings_set_hostname (settings, string);
- g_free (string);
-
- string = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_USERNAME,TRUE);
- modest_server_account_settings_set_username (settings, string);
- g_free (string);
+ proto = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
+ if (proto) {
+ gchar *tag = NULL;
+ if (is_transport_and_not_store) {
+ tag = MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS;
+ } else {
+ tag = MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS;
+ }
+ protocol = modest_protocol_registry_get_protocol_by_name (registry, tag, proto);
- string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
- if (is_transport_and_not_store) {
- protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS, string);
+ modest_server_account_settings_set_protocol (settings,
+ modest_protocol_get_type_id (protocol));
+ g_free (proto);
} else {
- protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS, string);
+ goto on_error;
}
- modest_server_account_settings_set_protocol (settings,
- modest_protocol_get_type_id (protocol));
- g_free (string);
modest_server_account_settings_set_port (settings,
modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE));
- string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
- if (string) {
- protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS, string);
+ auth = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_AUTH_MECH, TRUE);
+ if (auth) {
+ protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS, auth);
modest_server_account_settings_set_auth_protocol (settings,
modest_protocol_get_type_id (protocol));
- g_free (string);
+ g_free (auth);
} else {
modest_server_account_settings_set_auth_protocol (settings, MODEST_PROTOCOLS_AUTH_NONE);
}
-
- string = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE);
- if (string) {
- protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_CONNECTION_PROTOCOLS, string);
+
+ sec = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SECURITY, TRUE);
+ if (sec) {
+ protocol = modest_protocol_registry_get_protocol_by_name (registry, MODEST_PROTOCOL_REGISTRY_CONNECTION_PROTOCOLS, sec);
modest_server_account_settings_set_security_protocol (settings,
modest_protocol_get_type_id (protocol));
- g_free (string);
+ g_free (sec);
} else {
modest_server_account_settings_set_security_protocol (settings,
MODEST_PROTOCOLS_CONNECTION_NONE);
}
- string = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_PASSWORD, TRUE);
- modest_server_account_settings_set_password (settings, string);
- g_free (string);
-
- string = modest_account_mgr_get_string (self, name,
- MODEST_ACCOUNT_URI, TRUE);
- modest_server_account_settings_set_uri (settings, string);
- g_free (string);
-
+ /* Username, password and URI. Note that the URI could include
+ the former two, so in this case there is no need to have
+ them */
+ username = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_USERNAME,TRUE);
+ if (username)
+ modest_server_account_settings_set_username (settings, username);
+
+ pwd = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_PASSWORD, TRUE);
+ if (pwd) {
+ modest_server_account_settings_set_password (settings, pwd);
+ g_free (pwd);
+ }
+
+ uri = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_URI, TRUE);
+ if (uri)
+ modest_server_account_settings_set_uri (settings, uri);
+
+ hostname = modest_account_mgr_get_string (self, name,
+ MODEST_ACCOUNT_HOSTNAME,TRUE);
+ if (hostname)
+ modest_server_account_settings_set_hostname (settings, hostname);
+
+ if (!uri) {
+ if (!username || !hostname) {
+ g_free (username);
+ g_free (hostname);
+ goto on_error;
+ }
+ }
+
+ g_free (username);
+ g_free (hostname);
+ g_free (uri);
+
return settings;
+
+ on_error:
+ if (settings)
+ g_object_unref (settings);
+ return NULL;
}
gboolean
if (server_account) {
ModestServerAccountSettings *store_settings;
store_settings = modest_account_mgr_load_server_settings (self, server_account, FALSE);
- modest_account_settings_set_store_settings (settings,
- store_settings);
- g_object_unref (store_settings);
g_free (server_account);
+
+ /* It could happen that the account data is corrupted
+ so it's not loaded properly */
+ if (store_settings) {
+ modest_account_settings_set_store_settings (settings,
+ store_settings);
+ g_object_unref (store_settings);
+ } else {
+ g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__);
+ g_object_unref (settings);
+ return NULL;
+ }
}
/* transport */
if (server_account) {
ModestServerAccountSettings *transport_settings;
transport_settings = modest_account_mgr_load_server_settings (self, server_account, TRUE);
- modest_account_settings_set_transport_settings (settings, transport_settings);
- g_object_unref (transport_settings);
g_free (server_account);
+
+ if (transport_settings) {
+ modest_account_settings_set_transport_settings (settings, transport_settings);
+ g_object_unref (transport_settings);
+ } else {
+ g_message ("%s can not load server settings. Account corrupted?", __FUNCTION__);
+ g_object_unref (settings);
+ return NULL;
+ }
}
return settings;
modest_account_mgr_save_account_settings (ModestAccountMgr *mgr,
ModestAccountSettings *settings)
{
- g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr));
- g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
-
const gchar *account_name;
- const gchar *store_account_name;
- const gchar *transport_account_name;
ModestServerAccountSettings *store_settings;
ModestServerAccountSettings *transport_settings;
+ g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr));
+ g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
+
account_name = modest_account_settings_get_account_name (settings);
g_return_if_fail (account_name != NULL);
modest_account_settings_get_use_connection_specific_smtp (settings));
store_settings = modest_account_settings_get_store_settings (settings);
- store_account_name = modest_server_account_settings_get_account_name (store_settings);
- if (store_settings != NULL) {
+ if (store_settings) {
+ const gchar *store_account_name;
+ store_account_name = modest_server_account_settings_get_account_name (store_settings);
+ if (store_account_name)
+ modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT,
+ store_account_name, FALSE);
modest_account_mgr_save_server_settings (mgr, store_settings);
+ g_object_unref (store_settings);
}
- modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, store_account_name, FALSE);
- g_object_unref (store_settings);
transport_settings = modest_account_settings_get_transport_settings (settings);
- transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
- if (transport_settings != NULL) {
+ if (transport_settings) {
+ const gchar *transport_account_name;
+ transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
+ if (transport_account_name)
+ modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,
+ transport_account_name, FALSE);
modest_account_mgr_save_server_settings (mgr, transport_settings);
+ g_object_unref (transport_settings);
}
- modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, transport_account_name, FALSE);
- g_object_unref (transport_settings);
modest_account_mgr_set_enabled (mgr, account_name, TRUE);
}
projects / modest / blobdiff