2006-04-11 [cleroy] 2.1.0cvs29

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 100305472e03cd897e3f58564d37eda87710bb15..b77e3b581000137f97651e0bcdb199cad61ba977 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -330,7 +330,7 @@ static PrefParam param[] = {
         &prefs_common.ng_abbrev_len, P_INT,
         NULL, NULL, NULL},
 
-       {"translate_header", "TRUE", &prefs_common.trans_hdr, P_BOOL,
+       {"translate_header", "FALSE", &prefs_common.trans_hdr, P_BOOL,
         NULL, NULL, NULL},
 
        /* Display: Summary View */
@@ -522,6 +522,14 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
         NULL, NULL, NULL},
+       {"enable_bgcolor", "FALSE", &prefs_common.enable_bgcolor, P_BOOL,
+        NULL, NULL, NULL},
+       {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
+        NULL, NULL, NULL},
+       {"quote_level2_bgcolor", "13948116", &prefs_common.quote_level2_bgcol, P_COLOR,
+        NULL, NULL, NULL},
+       {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
+        NULL, NULL, NULL},
        {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
         NULL, NULL, NULL},
        {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
@@ -706,6 +714,16 @@ static PrefParam param[] = {
        {"logwin_height", "-1", &prefs_common.logwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"folderselwin_width", "300", &prefs_common.folderselwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"folderselwin_height", "-1", &prefs_common.folderselwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addressaddwin_width", "300", &prefs_common.addressaddwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"addressaddwin_height", "-1", &prefs_common.addressaddwin_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -736,6 +754,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"statusbar_update_step", "10", &prefs_common.statusbar_update_step, P_INT,
         NULL, NULL, NULL},
+       {"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -778,6 +798,7 @@ GList *prefs_common_read_history(const gchar *history)
 void prefs_common_read_config(void)
 {
        gchar *rcpath;
+       gchar *tmp;
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
        prefs_read_config(param, "Common", rcpath, NULL);
@@ -787,9 +808,17 @@ void prefs_common_read_config(void)
 
        g_free(rcpath);
 
-       prefs_common.quotefmt = gettext(prefs_common.quotefmt);
-       prefs_common.fw_quotefmt = gettext(prefs_common.fw_quotefmt);
-       prefs_common.date_format = gettext(prefs_common.date_format);
+       tmp = g_strdup(gettext(prefs_common.quotefmt));
+       g_free(prefs_common.quotefmt);
+       prefs_common.quotefmt = tmp;
+
+       tmp = g_strdup(gettext(prefs_common.fw_quotefmt));
+       g_free(prefs_common.fw_quotefmt);
+       prefs_common.fw_quotefmt = tmp;
+       
+       tmp = g_strdup(gettext(prefs_common.date_format));
+       g_free(prefs_common.date_format);
+       prefs_common.date_format = tmp;
 
        prefs_common.mime_open_cmd_history =
                prefs_common_read_history(COMMAND_HISTORY);