rework Display/Summaries

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index d28153b867436a6a53ffa9a75875aac309db3631..a305c729432293dec70bcbc091685d229ac08140 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -60,6 +60,9 @@
 #include "stock_pixmap.h"
 #include "prefswindow.h"
 #include "colorlabel.h"
+#include "passwordstore.h"
+#include "file-utils.h"
+
 #ifndef USE_ALT_ADDRBOOK
        #include "addrcustomattr.h"
 #endif
@@ -456,8 +459,6 @@ static PrefParam param[] = {
         {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
         NULL, NULL, NULL},
 
-       {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
-        NULL, NULL, NULL},
 #ifndef GENERIC_UMPC
        {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
         NULL, NULL, NULL},
@@ -615,6 +616,18 @@ static PrefParam param[] = {
        {"folder_col_size_total", "32",
         &prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
 #endif
+
+       {"folder_default_thread", "TRUE", &prefs_common.folder_default_thread, P_BOOL,
+        NULL, NULL, NULL},
+       {"folder_default_thread_collapsed", "FALSE", &prefs_common.folder_default_thread_collapsed, P_BOOL,
+        NULL, NULL, NULL},
+       {"folder_default_hide_read_threads", "FALSE", &prefs_common.folder_default_hide_read_threads, P_BOOL,
+        NULL, NULL, NULL},
+       {"folder_default_hide_read_msgs", "FALSE", &prefs_common.folder_default_hide_read_msgs, P_BOOL,
+        NULL, NULL, NULL},
+       {"folder_default_hide_del_msgs", "FALSE", &prefs_common.folder_default_hide_del_msgs, P_BOOL,
+        NULL, NULL, NULL},
+
        {"summaryview_width", "500", &prefs_common.summaryview_width, P_INT,
         NULL, NULL, NULL},
        {"summaryview_height", "244", &prefs_common.summaryview_height, P_INT,
@@ -876,6 +889,8 @@ static PrefParam param[] = {
 
        {"ask_mark_all_read", "TRUE", &prefs_common.ask_mark_all_read, P_BOOL,
         NULL, NULL, NULL},
+       {"ask_override_colorlabel", "TRUE", &prefs_common.ask_override_colorlabel, P_BOOL,
+        NULL, NULL, NULL},
 
        {"ask_apply_per_account_filtering_rules", "TRUE", &prefs_common.ask_apply_per_account_filtering_rules, P_BOOL,
         NULL, NULL, NULL},
@@ -1253,6 +1268,14 @@ static PrefParam param[] = {
        {"master_passphrase_pbkdf2_rounds", "50000", &prefs_common.master_passphrase_pbkdf2_rounds, P_INT, NULL, NULL, NULL},
 #endif
 
+       {"use_proxy", "FALSE", &prefs_common.use_proxy, P_BOOL, NULL, NULL, NULL},
+       {"proxy_type", "1", &prefs_common.proxy_info.proxy_type, P_ENUM, NULL, NULL, NULL},
+       {"proxy_host", "localhost", &prefs_common.proxy_info.proxy_host, P_STRING, NULL, NULL, NULL},
+       {"proxy_port", "1080", &prefs_common.proxy_info.proxy_port, P_USHORT, NULL, NULL, NULL},
+       {"use_proxy_auth", "FALSE", &prefs_common.proxy_info.use_proxy_auth, P_BOOL, NULL, NULL, NULL},
+       {"proxy_name", "", &prefs_common.proxy_info.proxy_name, P_STRING, NULL, NULL, NULL},
+       {"proxy_pass", NULL, &prefs_common.proxy_info.proxy_pass, P_STRING, NULL, NULL, NULL},
+
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -1276,19 +1299,19 @@ GList *prefs_common_read_history_from_dir_with_defaults(const gchar *dirname, co
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, history,
                           NULL);
        }
-       if ((fp = g_fopen(path, "rb")) == NULL) {
-               if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+       if ((fp = claws_fopen(path, "rb")) == NULL) {
+               if (ENOENT != errno) FILE_OP_ERROR(path, "claws_fopen");
                g_free(path);
                /* returns default list if set, otherwise NULL */
                return default_list;
        }
        g_free(path);
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
+       while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
                g_strstrip(buf);
                if (buf[0] == '\0') continue;
                tmp = add_history(tmp, buf);
        }
-       fclose(fp);
+       claws_fclose(fp);
 
        tmp = g_list_reverse(tmp);
 
@@ -1378,18 +1401,18 @@ static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *
        }
        tmp_path = g_strconcat(path, ".tmp", NULL);
 
-       if ((fp = g_fopen(tmp_path, "wb")) == NULL) {
-               FILE_OP_ERROR(tmp_path, "fopen");
+       if ((fp = claws_fopen(tmp_path, "wb")) == NULL) {
+               FILE_OP_ERROR(tmp_path, "claws_fopen");
                goto out;
        }
 
        for (cur = list; cur != NULL; cur = cur->next) {
-               TRY(fputs((gchar *)cur->data, fp) != EOF &&
-                   fputc('\n', fp) != EOF);
+               TRY(claws_fputs((gchar *)cur->data, fp) != EOF &&
+                   claws_fputc('\n', fp) != EOF);
        }
 
-       if (fclose(fp) == EOF) {
-               FILE_OP_ERROR(tmp_path, "fclose");
+       if (claws_safe_fclose(fp) == EOF) {
+               FILE_OP_ERROR(tmp_path, "claws_fclose");
                fp = NULL;
                goto out;
        }
@@ -1404,7 +1427,7 @@ static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *
 
 out:
        if (fp)
-               fclose(fp);
+               claws_safe_fclose(fp);
        g_free(tmp_path);
        g_free(path);
 }