2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2

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

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index fde5cc4..7fef539 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -251,7 +251,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
        if (!ok) {
                g_printerr ("modest: cannot set display name\n");
                if (err) {
-                       g_printerr ("modest: %s\n", err->message);
+                       g_printerr ("modest: Error adding account conf: %s\n", err->message);
                        g_error_free (err);
                }
                return FALSE;
@@ -265,7 +265,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
                        g_printerr ("modest: failed to set store account '%s'\n",
                                store_account);
                        if (err) {
-                               g_printerr ("modest: %s\n", err->message);
+                               g_printerr ("modest: Error adding store account conf: %s\n", err->message);
                                g_error_free (err);
                        }
                        
@@ -282,12 +282,20 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
                        g_printerr ("modest: failed to set transport account '%s'\n",
                                    transport_account);
                        if (err) {
-                               g_printerr ("modest: %s\n", err->message);
+                               g_printerr ("modest: Error adding transport account conf: %s\n", err->message);
                                g_error_free (err);
                        }       
                        return FALSE;
                }
        }
+
+       /* 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);
 
        /* if no default account has been defined yet, do so now */
@@ -409,10 +417,8 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self,
        if (!ok)
                goto cleanup;
        
-       if (modest_protocol_info_protocol_is_store(proto)) {
-               /* Add the security settings: */
-               modest_server_account_set_security (self, name, security);
-       }
+       /* Add the security settings: */
+       modest_server_account_set_security (self, name, security);
        
 cleanup:
        if (!ok) {
@@ -482,7 +488,7 @@ modest_account_mgr_remove_account (ModestAccountMgr * self,
        g_return_val_if_fail (name, FALSE);
 
        if (!modest_account_mgr_account_exists (self, name, server_account)) {
-               g_printerr ("modest: account '%s' does not exist\n", name);
+               g_printerr ("modest: %s: account '%s' does not exist\n", __FUNCTION__, name);
                return FALSE;
        }
 
@@ -629,27 +635,40 @@ modest_account_mgr_account_names (ModestAccountMgr * self, gboolean only_enabled
                
        GSList *result = NULL;
        
-       /* Filter-out the disabled accounts if requested: */
-       if (only_enabled) {
-               GSList *iter = accounts;
-               while (iter) {
-                       if (!(iter->data))
-                               continue;
-                               
-                       const gchar* account_name = (const gchar*)iter->data;
-                       if (account_name && modest_account_mgr_get_enabled (self, account_name))
-                               result = g_slist_append (result, g_strdup (account_name));
-                               
-                       iter = g_slist_next (iter);     
+       /* Unescape the keys to get the account names: */
+       GSList *iter = accounts;
+       while (iter) {
+               if (!(iter->data))
+                       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) {
+                       if (unescaped_name && 
+                               !modest_account_mgr_get_enabled (self, unescaped_name)) {
+                               add = FALSE;
+                       }
                }
                
-               /* TODO: Free the strings too? */
-               g_slist_free (accounts);
-               accounts = NULL;
+               if (add) {      
+                       result = g_slist_append (result, unescaped_name);
+               }
+               else {
+                       g_free (unescaped_name);
+               }
+                       
+               iter = g_slist_next (iter);     
        }
-       else
-               result = accounts;
        
+       /* TODO: Free the strings too? */
+       g_slist_free (accounts);
+       accounts = NULL;
 
        return result;
 }