talons

commit 6581aadd4e219ae3973e13dd93c75bd3e80e8bd8
parent 9b75d6e1d3dd72681d1e153707f4fd40f26dec5c
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 29 Nov 2012 09:56:28 +0000

2012-11-29 [colin]	3.9.0cvs30

	* src/mainwindow.c
		Fix mask on a few menu items (thanks Ricardo!)

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

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-29 [colin]	3.9.0cvs30
+
+	* src/mainwindow.c
+		Fix mask on a few menu items (thanks Ricardo!)
+
 2012-11-28 [wwp]	3.9.0cvs29
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4527,3 +4527,4 @@
 ( cvs diff -u -r 1.179.2.269 -r 1.179.2.270 src/imap.c;  cvs diff -u -r 1.101.2.73 -r 1.101.2.74 src/news.c;  cvs diff -u -r 1.23.2.28 -r 1.23.2.29 src/common/session.c;  cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/common/session.h;  ) > 3.9.0cvs27.patchset
 ( cvs diff -u -r 1.274.2.357 -r 1.274.2.358 src/mainwindow.c;  cvs diff -u -r 1.101.2.74 -r 1.101.2.75 src/news.c;  cvs diff -u -r 1.21.2.11 -r 1.21.2.12 src/news.h;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/etpan/nntp-thread.c;  ) > 3.9.0cvs28.patchset
 ( cvs diff -u -r 1.274.2.358 -r 1.274.2.359 src/mainwindow.c;  cvs diff -u -r 1.39.2.65 -r 1.39.2.66 src/mainwindow.h;  cvs diff -u -r 1.395.2.458 -r 1.395.2.459 src/summaryview.c;  cvs diff -u -r 1.43.2.132 -r 1.43.2.133 src/toolbar.c;  ) > 3.9.0cvs29.patchset
+( cvs diff -u -r 1.274.2.359 -r 1.274.2.360 src/mainwindow.c;  ) > 3.9.0cvs30.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=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3414,7 +3414,7 @@ do { \
 
 	for (; cur_item != NULL; cur_item = cur_item->next) {
 		gtk_widget_set_sensitive(GTK_WIDGET(cur_item->data),
-					 (M_UNLOCKED & state) != 0);
+					 (main_window_get_mask(M_UNLOCKED, -1) & state) != 0);
 	}
 
 	g_list_free(children);
@@ -3480,10 +3480,10 @@ do { \
 	&&  mainwin->messageview->mimeview->textview)
 		cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders",
 			      			prefs_common.show_all_headers);
-	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0);
-	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & M_THREADED) != 0);
-	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & M_THREADED) != 0);
-	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & M_THREADED) != 0);
+	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+	cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));