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.

diff --git a/ChangeLog b/ChangeLog
index cbfc1274f7b3e840bd1964585ea3fe3cecf4f3ca..037b5e23185c9f538351addac1e1d3f33517d634 100644 (file)
--- 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
 2012-12-03 [wwp]       3.9.0cvs39
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 97d29d295a4df8c73d394ea9bb73ba8665e863d0..f00ae91089e4c57a189eae84bea0f9064109d273 100644 (file)
--- 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.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
index e1660d516926edc61176276d1b1c7ee60e82fef7..84af6e5f644ac25c656d7d9dae68b75e467ff62d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=39
+EXTRA_VERSION=40

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 88e0256dee20722432d9b9305bd46fef08563cc7..68a3b6eceecf9684af7ca14e3ab50a37eb8ce17a 100644 (file)
--- 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("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);
 #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
index 2320742f38b2120fe593f7ce78f23a3c3acfa76d..b1a4f33d279a23a13d63f150f7020b5f2919f766 100644 (file)
--- 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
 #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);
 #undef FILL_TABLE
        if (i != N_ENTRIES)
                g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);