2005-10-13 [colin] 1.9.15cvs35

	* src/folder_item_prefs.c
		Fix pref corruption on folder move. Patch
		by wwp

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4d7091e2145482f00b9deab2234e3a1190feadb7..7f931ac8d11c35635544147a3bacb953b9c24003 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-13 [colin]     1.9.15cvs35
+
+       * src/folder_item_prefs.c
+               Fix pref corruption on folder move. Patch
+               by wwp
+

 2005-10-13 [paul]      1.9.15cvs34
 
        * src/export.c
 2005-10-13 [paul]      1.9.15cvs34
 
        * src/export.c

diff --git a/PATCHSETS b/PATCHSETS
index f034381c1d317026997aa32019f378d7bead4c84..93b9da6f749420af5147b1f910a88a94aa205182 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -871,3 +871,4 @@
 ( cvs diff -u -r 1.382.2.182 -r 1.382.2.183 src/compose.c;  ) > 1.9.15cvs32.patchset
 ( cvs diff -u -r 1.83.2.41 -r 1.83.2.42 src/mimeview.c;  ) > 1.9.15cvs33.patchset
 ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/export.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/import.c;  cvs diff -u -r 1.105.2.37 -r 1.105.2.38 src/prefs_account.c;  ) > 1.9.15cvs34.patchset
 ( cvs diff -u -r 1.382.2.182 -r 1.382.2.183 src/compose.c;  ) > 1.9.15cvs32.patchset
 ( cvs diff -u -r 1.83.2.41 -r 1.83.2.42 src/mimeview.c;  ) > 1.9.15cvs33.patchset
 ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/export.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/import.c;  cvs diff -u -r 1.105.2.37 -r 1.105.2.38 src/prefs_account.c;  ) > 1.9.15cvs34.patchset

+( cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/folder_item_prefs.c;  ) > 1.9.15cvs35.patchset

diff --git a/configure.ac b/configure.ac
index 96fe163ddec0919fb9ee93b862259a30e7debcb2..91137654305beb35af6dea73ec20a14449e0ef22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 689c63daba5b67e95a79e96c6e63d35e028c89b7..a71b84d47e5d867b246e6be5f2a96dfe37af13e5 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -270,7 +270,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.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;
        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;