2006-12-26 [colin] 2.6.1cvs73

[claws.git] / src / folder_item_prefs.c

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index bf85ef4a68189c803f3015906b7357fc95a2f894..847ef5619bb847a5908aa786597c1b4f23e7e206 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /* alfons - all folder item specific settings should migrate into 
@@ -52,14 +52,6 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"sort_descending", "FALSE", &tmp_prefs.sort_descending, P_BOOL,
         NULL, NULL, NULL},
-       /*{"enable_thread", "TRUE", &tmp_prefs.enable_thread, P_BOOL,
-        NULL, NULL, NULL},*/
-#if 0
-       {"hide_score", "-9999", &tmp_prefs.kill_score, P_INT,
-        NULL, NULL, NULL},
-       {"important_score", "1", &tmp_prefs.important_score, P_INT,
-        NULL, NULL, NULL},
-#endif
        /* MIGRATION */  
        {"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
         NULL, NULL, NULL},
@@ -88,6 +80,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"default_dictionary", NULL, &tmp_prefs.default_dictionary, P_STRING,
         NULL, NULL, NULL},
+       {"enable_default_alt_dictionary", "", &tmp_prefs.enable_default_alt_dictionary, P_BOOL,
+        NULL, NULL, NULL},
+       {"default_alt_dictionary", NULL, &tmp_prefs.default_alt_dictionary, P_STRING,
+        NULL, NULL, NULL},
 #endif  
        {"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
         NULL, NULL, NULL},
@@ -97,6 +93,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"newmailcheck", "TRUE", &tmp_prefs.newmailcheck, P_BOOL,
         NULL, NULL, NULL},
+       {"offlinesync", "FALSE", &tmp_prefs.offlinesync, P_BOOL,
+        NULL, NULL, NULL},
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -195,6 +193,7 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
        prefs->processing = NULL;
 
        prefs->newmailcheck = TRUE;
+       prefs->offlinesync = FALSE;
 
        return prefs;
 }
@@ -210,10 +209,8 @@ FolderItemPrefs * folder_item_prefs_new(void)
 
 void folder_item_prefs_free(FolderItemPrefs * prefs)
 {
-       if (prefs->default_to) 
-               g_free(prefs->default_to);
-       if (prefs->default_reply_to) 
-               g_free(prefs->default_reply_to);
+       g_free(prefs->default_to);
+       g_free(prefs->default_reply_to);
        g_free(prefs);
 }
 
@@ -249,7 +246,8 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        tmp_prefs.sort_descending               = src->prefs->sort_descending;
        tmp_prefs.enable_thread                 = src->prefs->enable_thread;
         tmp_prefs.enable_processing             = src->prefs->enable_processing;
-    tmp_prefs.newmailcheck             = src->prefs->newmailcheck;
+       tmp_prefs.newmailcheck                  = src->prefs->newmailcheck;
+       tmp_prefs.offlinesync                  = src->prefs->offlinesync;
 
        prefs_matcher_read_config();
 
@@ -266,7 +264,7 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        tmp_prefs.enable_default_to             = src->prefs->enable_default_to;
        tmp_prefs.default_to                    = g_strdup(src->prefs->default_to);
        tmp_prefs.enable_default_reply_to       = src->prefs->enable_default_reply_to;
-       tmp_prefs.default_reply_to              = src->prefs->default_reply_to;
+       tmp_prefs.default_reply_to              = g_strdup(src->prefs->default_reply_to);
        tmp_prefs.enable_simplify_subject       = src->prefs->enable_simplify_subject;
        tmp_prefs.simplify_subject_regexp       = g_strdup(src->prefs->simplify_subject_regexp);
        tmp_prefs.enable_folder_chmod           = src->prefs->enable_folder_chmod;
@@ -276,6 +274,8 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
 #if USE_ASPELL
        tmp_prefs.enable_default_dictionary     = src->prefs->enable_default_dictionary;
        tmp_prefs.default_dictionary            = g_strdup(src->prefs->default_dictionary);
+       tmp_prefs.enable_default_alt_dictionary = src->prefs->enable_default_alt_dictionary;
+       tmp_prefs.default_alt_dictionary        = g_strdup(src->prefs->default_alt_dictionary);
 #endif
        tmp_prefs.save_copy_to_folder           = src->prefs->save_copy_to_folder;
        tmp_prefs.color                         = src->prefs->color;