talons

commit a4f920bbf47037208f3386709fd7227bec0f922d
parent 2f7b238b758e7122a4371e5ba9b30fe18645ab19
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Wed, 23 Jun 2010 16:40:16 +0000

2010-06-23 [wwp]	3.7.6cvs11

	* src/gtk/colorlabel.c
		Silent up a warning by avoiding possible confusion
		in logical expression evaluation, thanks to TuxCM.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/colorlabel.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-23 [wwp]	3.7.6cvs11
+
+	* src/gtk/colorlabel.c
+		Silent up a warning by avoiding possible confusion
+		in logical expression evaluation, thanks to TuxCM.
+
 2010-06-21 [iwkse]	3.7.6cvs10
 
 	* src/gtk/quicksearch.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4006,3 +4006,4 @@
 ( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/ldapctrl.c;  ) > 3.7.6cvs8.patchset
 ( cvs diff -u -r 1.395.2.419 -r 1.395.2.420 src/summaryview.c;  cvs diff -u -r 1.68.2.55 -r 1.68.2.56 src/summaryview.h;  ) > 3.7.6cvs9.patchset
 ( cvs diff -u -r 1.1.2.92 -r 1.1.2.93 src/gtk/quicksearch.c;  ) > 3.7.6cvs10.patchset
+( cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/gtk/colorlabel.c;  ) > 3.7.6cvs11.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
@@ -265,7 +265,7 @@ static void colorlabel_recreate_label(gint color)
 	int i;
 	
 	for (i = 0; i < NUM_MENUS; i++) {
-		if (!label_colors[i][color].changed & LCCF_LABEL)
+		if (!(label_colors[i][color].changed & LCCF_LABEL))
 			continue;
 
 		if (label_colors[i][color].label == NULL)