From: Tristan Chabredier <wwp@claws-mail.org>
Date: Mon, 4 Jun 2007 15:52:53 +0000 (+0000)
Subject: 2007-06-04 [wwp]	2.9.2cvs35
X-Git-Tag: rel_2_10_0~46
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e9df0dd4da110076ab2e7604c4da886eeec54d4f

2007-06-04 [wwp]	2.9.2cvs35

	* src/prefs_compose_writing.c
	* src/prefs_quote.c
		Fix a bug where Quotation characters (prefs/compose/writing)
		was cleared (introduced w/ 2.9.2cvs26).
---

diff --git a/ChangeLog b/ChangeLog
index 50eb6d72b..fadbf7013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-04 [wwp]	2.9.2cvs35
+
+	* src/prefs_compose_writing.c
+	* src/prefs_quote.c
+		Fix a bug where Quotation characters (prefs/compose/writing)
+		was cleared (introduced w/ 2.9.2cvs26).
+
 2007-06-04 [wwp]	2.9.2cvs34
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
index 2741354af..9e672206a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2610,3 +2610,4 @@
 ( cvs diff -u -r 1.47.2.42 -r 1.47.2.43 src/procheader.c;  cvs diff -u -r 1.36.2.102 -r 1.36.2.103 src/common/utils.c;  cvs diff -u -r 1.20.2.45 -r 1.20.2.46 src/common/utils.h;  ) > 2.9.2cvs32.patchset
 ( cvs diff -u -r 1.61.2.63 -r 1.61.2.64 src/account.c;  cvs diff -u -r 1.105.2.98 -r 1.105.2.99 src/prefs_account.c;  cvs diff -u -r 1.49.2.29 -r 1.49.2.30 src/prefs_account.h;  cvs diff -u -r 1.150.2.95 -r 1.150.2.96 src/procmsg.c;  ) > 2.9.2cvs33.patchset
 ( cvs diff -u -r 1.105.2.99 -r 1.105.2.100 src/prefs_account.c;  cvs diff -u -r 1.49.2.30 -r 1.49.2.31 src/prefs_account.h;  ) > 2.9.2cvs34.patchset
+( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_quote.c;  ) > 2.9.2cvs35.patchset
diff --git a/configure.ac b/configure.ac
index c6222a39f..6e1d15b8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 5de6f000a..f4a51409f 100644
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -327,6 +327,7 @@ static void prefs_compose_writing_save(PrefsPage *_page)
 	prefs_common.compose_dnd_mode = GPOINTER_TO_INT
 		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
 
+	g_free(prefs_common.quote_chars); 
 	prefs_common.quote_chars = gtk_editable_get_chars(
 			GTK_EDITABLE(page->entry_quote_chars), 0, -1);
 	remove_space(prefs_common.quote_chars);
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
index e6835aae6..92f41c669 100644
--- a/src/prefs_quote.c
+++ b/src/prefs_quote.c
@@ -55,7 +55,6 @@ typedef struct _QuotePage
 	GtkWidget *text_quotefmt;
 	GtkWidget *entry_fw_quotemark;
 	GtkWidget *text_fw_quotefmt;
-	GtkWidget *label_quote_chars;
 	GtkWidget *btn_quotedesc;
 } QuotePage;
 
@@ -142,8 +141,6 @@ static void prefs_quote_save(PrefsPage *_page)
 	prefs_common.quotemark = NULL;
 	g_free(prefs_common.fw_quotemark); 
 	prefs_common.fw_quotemark = NULL;
-	g_free(prefs_common.quote_chars); 
-	prefs_common.quote_chars = NULL;
 	
 	prefs_common.compose_with_format =
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));