This is a manual merge of branch drop split view intro trunk.

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 976c2e2..a315b2b 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -429,7 +429,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
        /* if we're not in overwrite mode, only write stuff it
         * there was nothing before */
        if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-               modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
+               modest_conf_set_float (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
        
        g_free (key);
 
@@ -438,7 +438,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
        /* if we're not in overwrite mode, only write stuff it
         * there was nothing before */
        if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-               modest_conf_set_int (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
+               modest_conf_set_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
        
        g_free (key);
        return TRUE;
@@ -729,7 +729,7 @@ init_default_settings (ModestConf *conf)
 
        /* Editor keys */
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+               modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, FALSE, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);