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.

diff --git a/ChangeLog b/ChangeLog
index 3e0dd350ca5b02d4f3a21e487d2c3749e387bcda..01326dbcded9885abe1bb1a90a6bf30b95126956 100644 (file)
--- 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
index 5a8264442e81e270c58db351a0f98bdc49ccf51d..5bd8a615c9268b397d1135704cfe9be1af48dc57 100644 (file)
--- 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
index bb9e6a48abff07a00b252d5df1d3646cdc6ff67c..e9ab31090a1634dde8fb5a78fbf035978d11190e 100644 (file)
--- 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
index 6b32c52984b345beca1b42efafb25fd18b9c7103..147918603be612fe46d353f81555478e83c6b0d0 100644 (file)
--- 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)