From: Tristan Chabredier <wwp@claws-mail.org>
Date: Thu, 28 Dec 2006 10:49:09 +0000 (+0000)
Subject: 2006-12-28 [wwp]	2.6.1cvs83
X-Git-Tag: rel_2_7_0~38
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1c55b01124e0dee5cb1442b722779f4091d08e9f

2006-12-28 [wwp]	2.6.1cvs83

	* src/prefs_folder_item.c
		Fix coloring of "simplify subject regexp" (folder prefs),
		which might be left to red whereas the regexp gets empty.
---

diff --git a/ChangeLog b/ChangeLog
index 8068a4098..aa0d39b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-28 [wwp]	2.6.1cvs83
+
+	* src/prefs_folder_item.c
+		Fix coloring of "simplify subject regexp" (folder prefs),
+		which might be left to red whereas the regexp gets empty.
+
 2006-12-28 [wwp]	2.6.1cvs82
 
 	* src/prefs_common.c
diff --git a/PATCHSETS b/PATCHSETS
index aba35be95..15670a7c5 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2190,3 +2190,4 @@
 ( cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/folder_item_prefs.c;  ) > 2.6.1cvs80.patchset
 ( cvs diff -u -r 1.9.2.47 -r 1.9.2.48 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/gtkaspell.h;  cvs diff -u -r 1.382.2.346 -r 1.382.2.347 src/compose.c;  ) > 2.6.1cvs81.patchset
 ( cvs diff -u -r 1.204.2.115 -r 1.204.2.116 src/prefs_common.c;  cvs diff -u -r 1.103.2.72 -r 1.103.2.73 src/prefs_common.h;  cvs diff -u -r 1.60.2.72 -r 1.60.2.73 src/addressbook.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/addressitem.h;  ) > 2.6.1cvs82.patchset
+( cvs diff -u -r 1.52.2.30 -r 1.52.2.31 src/prefs_folder_item.c;  ) > 2.6.1cvs83.patchset
diff --git a/configure.ac b/configure.ac
index 62fa3468d..f24e2ea47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 1ec4ddbc3..7f1f18524 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1081,6 +1081,8 @@ static void folder_regexp_test_cb(GtkWidget *widget, gpointer data)
 	test_string = g_strdup(gtk_entry_get_text(GTK_ENTRY(page->entry_regexp_test_string)));
 
 	if (!regexp || !regexp[0]) {
+		gtk_widget_modify_base(page->entry_simplify_subject,
+				GTK_STATE_NORMAL, NULL);
 		if (test_string) {
 			gtk_entry_set_text(GTK_ENTRY(page->entry_regexp_test_result), test_string);
 			g_free(test_string);