From: Colin Leroy <colin@colino.net>
Date: Fri, 15 Sep 2006 17:11:00 +0000 (+0000)
Subject: 2006-09-15 [colin]	2.4.0cvs189
X-Git-Tag: rel_2_5_0~27
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3bab86cc3e7cd8a78f024e0338c80c653ca6e6a2;hp=afc889a0904124f5b2261d574a83a42e586084b1;ds=sidebyside

2006-09-15 [colin]	2.4.0cvs189

	* src/summaryview.c
		HIG order on dialog
---

diff --git a/ChangeLog b/ChangeLog
index 5c2ce562b..91cbd91f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-15 [colin]	2.4.0cvs189
+
+	* src/summaryview.c
+		HIG order on dialog
+
 2006-09-14 [colin]	2.4.0cvs188
 
 	* src/common/socket.c
diff --git a/PATCHSETS b/PATCHSETS
index 661e79987..1f0c41ce6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1880,3 +1880,4 @@
 ( cvs diff -u -r 1.204.2.101 -r 1.204.2.102 src/prefs_common.c;  cvs diff -u -r 1.103.2.60 -r 1.103.2.61 src/prefs_common.h;  cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 manual/advanced.xml;  ) > 2.4.0cvs186.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 manual/advanced.xml;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/pluginwindow.c;  ) > 2.4.0cvs187.patchset
 ( cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/common/socket.c;  cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/common/socket.h;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/common/ssl.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.4.50 -r 1.1.4.51 src/etpan/imap-thread.c;  ) > 2.4.0cvs188.patchset
+( cvs diff -u -r 1.395.2.249 -r 1.395.2.250 src/summaryview.c;  ) > 2.4.0cvs189.patchset
diff --git a/configure.ac b/configure.ac
index c2cd0a77b..1e3e8220b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=188
+EXTRA_VERSION=189
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
index dc224dc24..7c0148485 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4621,8 +4621,8 @@ gboolean summary_filter_get_mode(void)
 			_("Filtering"),
 			_("There are some filtering rules that belong to an account.\n"
 			  "Please choose what to do with these rules:"),
-			_("_Filter"), GTK_STOCK_CANCEL, NULL, TRUE, vbox);
-	if ((val & ~G_ALERTDISABLE) != G_ALERTDEFAULT) {
+			GTK_STOCK_CANCEL, _("+_Filter"), NULL, TRUE, vbox);
+	if ((val & ~G_ALERTDISABLE) == G_ALERTDEFAULT) {
 		return FALSE;
 	} else if (val & G_ALERTDISABLE)
 		prefs_common.ask_apply_per_account_filtering_rules = FALSE;