* do some extra checking to prevent a random segfault sometimes; small cleanup

[modest] / src / modest-account-mgr-helpers.c

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index d2859c2..42eaa1d 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -85,7 +85,7 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
        
        GSList *list = modest_account_mgr_get_list (self, account_name, 
                                                        MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-                                                   MODEST_CONF_VALUE_STRING, TRUE);
+                                                   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);
@@ -93,8 +93,8 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
        
        /* Reset the changed list: */
        modest_account_mgr_set_list (self, account_name, 
-                                                       MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
-                                                   MODEST_CONF_VALUE_STRING, TRUE);
+                                                       MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
+                                                   MODEST_CONF_VALUE_STRING, FALSE);
                                
        /* TODO: Should we free the items too, or just the list? */
        g_slist_free (list);
@@ -117,7 +117,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 {
        GSList *list = modest_account_mgr_get_list (self, account_name, 
                                                        MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-                                                   MODEST_CONF_VALUE_STRING, TRUE);
+                                                   MODEST_CONF_VALUE_STRING, FALSE);
        if (!list)
                return FALSE;
                
@@ -132,7 +132,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
        /* Reset the changed list: */
        modest_account_mgr_set_list (self, account_name, 
                                                        MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
-                                                   MODEST_CONF_VALUE_STRING, TRUE);
+                                                   MODEST_CONF_VALUE_STRING, FALSE);
                                
        /* TODO: Should we free the items too, or just the list? */
        g_slist_free (list);
@@ -140,6 +140,20 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
        return TRUE;
 }
 
+gboolean modest_account_mgr_get_has_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;
+}
+
 /**
  * modest_account_mgr_get_connection_specific_smtp
  * @self: a ModestAccountMgr instance
@@ -157,17 +171,37 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self,
        
        GSList *list = modest_account_mgr_get_list (self, account_name, 
                                                        MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-                                                   MODEST_CONF_VALUE_STRING, TRUE);
+                                                   MODEST_CONF_VALUE_STRING, FALSE);
        if (!list)
                return NULL;
-               
+
        /* The server account is in the item after the connection name: */
-       GSList *list_connection = g_slist_find_custom (list, connection_name, (GCompareFunc)strcmp);
-       if (list_connection) {
-               GSList * list_server_account = g_slist_next(list_connection);
-               if (list_server_account)
-                       result = g_strdup ((gchar*)(list_server_account->data));
+       GSList *iter = list;
+       while (iter) {
+               const gchar* this_connection_name = (const gchar*)(iter->data);
+               if (strcmp (this_connection_name, connection_name) == 0) {
+                       iter = g_slist_next (iter);
+                       
+                       if (iter) {
+                               const gchar* account_name = (const gchar*)(iter->data);
+                               if (account_name) {
+                                       result = g_strdup (account_name);
+                                       break;
+                               }
+                       }
+               }
+               
+               /* Skip 2 to go to the next connection in the list: */
+               iter = g_slist_next (iter);
+               if (iter)
+                       iter = g_slist_next (iter);
+       }
+               
+       /*
+       if (!result) {
+               printf ("  debug: no server found for connection_name=%s.\n", connection_name); 
        }
+       */
                                
        /* TODO: Should we free the items too, or just the list? */
        g_slist_free (list);
@@ -290,9 +324,10 @@ get_security_for_conf_string(const gchar* value)
        if (value) {
                if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NONE) == 0)
                        result = MODEST_PROTOCOL_CONNECTION_NORMAL;
-               else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0)
+               else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0) {
+                       /* The UI has "Normal (TLS)": */
                        result = MODEST_PROTOCOL_CONNECTION_TLS;
-               else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
+               } else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
                        result = MODEST_PROTOCOL_CONNECTION_SSL;
        }
        
@@ -323,9 +358,10 @@ modest_server_account_set_security (ModestAccountMgr *self,
        const gchar* str_value = NULL;
        if (security == MODEST_PROTOCOL_CONNECTION_NORMAL)
                str_value = MODEST_ACCOUNT_SECURITY_VALUE_NONE;
-       else if (security == MODEST_PROTOCOL_CONNECTION_TLS)
+       else if (security == MODEST_PROTOCOL_CONNECTION_TLS) {
+               /* The UI has "Normal (TLS)": */
                str_value = MODEST_ACCOUNT_SECURITY_VALUE_NORMAL;
-       else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
+       } else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
                str_value = MODEST_ACCOUNT_SECURITY_VALUE_SSL;
        
        /* Set it in the configuration: */
@@ -345,7 +381,7 @@ modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar*
        data->hostname     = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_HOSTNAME,TRUE);
        data->username     = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_USERNAME,TRUE);  
        proto              = modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_PROTO, TRUE);
-       data->proto        = modest_protocol_info_get_protocol (proto, MODEST_TRANSPORT_STORE_PROTOCOL);
+       data->proto        = modest_protocol_info_get_transport_store_protocol (proto);
        g_free (proto);
 
        data->port         = modest_account_mgr_get_int (self, name, MODEST_ACCOUNT_PORT, TRUE);
@@ -491,12 +527,15 @@ modest_account_mgr_get_default_account  (ModestAccountMgr *self)
                return  NULL;
        }
        
-       /* it's not really an error if there is no default account */
-       if (!account) 
-               return NULL;
+       /* Make sure that at least one account is always the default, if possible:
+        * (It would be meaningless to have enabled accounts but no default account. */
+       if (!account) {
+               modest_account_mgr_set_first_account_as_default (self);
+               account = modest_conf_get_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, &err);
+       }
 
        /* sanity check */
-       if (!modest_account_mgr_account_exists (self, account, FALSE)) {
+       if (account && !modest_account_mgr_account_exists (self, account, FALSE)) {
                g_printerr ("modest: default account does not exist\n");
                g_free (account);
                return NULL;
@@ -553,7 +592,7 @@ modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
        if(list_sorted)
        {
                const gchar* account_name = (const gchar*)list_sorted->data;
-               if (account_name)
+               if (account_name) 
                        result = modest_account_mgr_set_default_account (self, account_name);
        }