talons

commit 6dea180b5c980a1dbdcc4e0b566bb8f372e42f0c
parent 54c3c935321d41a56c4051561e3ccc5c3edf071c
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Mon,  3 Dec 2012 10:11:37 +0000

2012-12-03 [wwp]	3.9.0cvs40

	* src/summaryview.c
	* src/mainwindow.c
	Avoid any possible confusion: 0 is not a neutral value when passed
	to main_window_get_mask() - use -1 instead, even in those cases we
	don't care.

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
2
+-
M
src/summaryview.c
 | 
2
+-

5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-03 [wwp]	3.9.0cvs40
+
+	* src/summaryview.c
+	* src/mainwindow.c
+	Avoid any possible confusion: 0 is not a neutral value when passed
+	to main_window_get_mask() - use -1 instead, even in those cases we
+	don't care.
+
 2012-12-03 [wwp]	3.9.0cvs39
 
 	* src/toolbar.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4537,3 +4537,4 @@
 ( cvs diff -u -r 1.115.2.266 -r 1.115.2.267 src/main.c;  ) > 3.9.0cvs37.patchset
 ( cvs diff -u -r 1.36.2.211 -r 1.36.2.212 src/common/utils.c;  ) > 3.9.0cvs38.patchset
 ( cvs diff -u -r 1.43.2.135 -r 1.43.2.136 src/toolbar.c;  ) > 3.9.0cvs39.patchset
+( cvs diff -u -r 1.395.2.460 -r 1.395.2.461 src/summaryview.c;  cvs diff -u -r 1.274.2.362 -r 1.274.2.363 src/mainwindow.c;  ) > 3.9.0cvs40.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3396,7 +3396,7 @@ do { \
 	FILL_TABLE("Menu/Configuration/AccountPrefs", M_UNLOCKED);
 	FILL_TABLE("Menu/Configuration/CreateAccount", M_UNLOCKED);
 	FILL_TABLE("Menu/Configuration/EditAccounts", M_UNLOCKED);
-	FILL_TABLE(NULL, 0);
+	FILL_TABLE(NULL, -1);
 #undef FILL_TABLE
 	if (i > N_ENTRIES)
 		g_error("main window menu entry table overrun (%d/%d)", i, N_ENTRIES);
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -1781,7 +1781,7 @@ do { \
 #ifndef GENERIC_UMPC
 	FILL_TABLE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
 #endif
-	FILL_TABLE(NULL, 0);
+	FILL_TABLE(NULL, -1);
 #undef FILL_TABLE
 	if (i != N_ENTRIES)
 		g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);