2008-09-12 [colin] 3.5.0cvs103

[claws.git] / src / folder_item_prefs.c

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 63844f3a8ba386f50b79b9b95d7ab55b20e33dd1..1d5e4e7feb3907ef2aefb862343d1d3c2ef6e99a 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -54,7 +54,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"default_account", NULL, &tmp_prefs.default_account, P_INT,
         NULL, NULL, NULL},
-#if USE_ASPELL
+#if USE_ENCHANT
        {"enable_default_dictionary", "", &tmp_prefs.enable_default_dictionary, P_BOOL,
         NULL, NULL, NULL},
        {"default_dictionary", NULL, &tmp_prefs.default_dictionary, P_STRING,
@@ -162,7 +162,7 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
        prefs->folder_chmod = 0;
        prefs->enable_default_account = FALSE;
        prefs->default_account = 0;
-#if USE_ASPELL
+#if USE_ENCHANT
        prefs->enable_default_dictionary = FALSE;
        prefs->default_dictionary = NULL;
        prefs->enable_default_alt_dictionary = FALSE;
@@ -183,13 +183,15 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
        prefs->compose_with_format = FALSE;
        prefs->compose_subject_format = NULL;
        prefs->compose_body_format = NULL;
+       prefs->compose_override_from_format = NULL;
        prefs->reply_with_format = FALSE;
        prefs->reply_quotemark = NULL;
        prefs->reply_body_format = NULL;
+       prefs->reply_override_from_format = NULL;
        prefs->forward_with_format = FALSE;
        prefs->forward_quotemark = NULL;
        prefs->forward_body_format = NULL;
-
+       prefs->forward_override_from_format = NULL;
        return prefs;
 }
 
@@ -208,10 +210,13 @@ void folder_item_prefs_free(FolderItemPrefs * prefs)
        g_free(prefs->default_reply_to);
        g_free(prefs->compose_subject_format);
        g_free(prefs->compose_body_format);
+       g_free(prefs->compose_override_from_format);
        g_free(prefs->reply_quotemark);
        g_free(prefs->reply_body_format);
+       g_free(prefs->reply_override_from_format);
        g_free(prefs->forward_quotemark);
        g_free(prefs->forward_body_format);
+       g_free(prefs->forward_override_from_format);
        g_free(prefs);
 }
 
@@ -253,7 +258,7 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        tmp_prefs.folder_chmod                  = src->prefs->folder_chmod;
        tmp_prefs.enable_default_account        = src->prefs->enable_default_account;
        tmp_prefs.default_account               = src->prefs->default_account;
-#if USE_ASPELL
+#if USE_ENCHANT
        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;
@@ -265,12 +270,15 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        tmp_prefs.compose_with_format = src->prefs->compose_with_format;
        tmp_prefs.compose_subject_format = g_strdup(src->prefs->compose_subject_format);
        tmp_prefs.compose_body_format = g_strdup(src->prefs->compose_body_format);
+       tmp_prefs.compose_override_from_format = g_strdup(src->prefs->compose_override_from_format);
        tmp_prefs.reply_with_format = src->prefs->reply_with_format;
        tmp_prefs.reply_quotemark = g_strdup(src->prefs->reply_quotemark);
        tmp_prefs.reply_body_format = g_strdup(src->prefs->reply_body_format);
+       tmp_prefs.reply_override_from_format = g_strdup(src->prefs->reply_override_from_format);
        tmp_prefs.forward_with_format = src->prefs->forward_with_format;
        tmp_prefs.forward_quotemark = g_strdup(src->prefs->forward_quotemark);
        tmp_prefs.forward_body_format = g_strdup(src->prefs->forward_body_format);
+       tmp_prefs.forward_override_from_format = g_strdup(src->prefs->forward_override_from_format);
 
        *dest->prefs = tmp_prefs;
        folder_item_prefs_save_config(dest);