[Commits] mainwindow.c 1.274.2.359 1.274.2.360

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv7506/src

Modified Files:
      Tag: gtk2
	mainwindow.c 
Log Message:
2012-11-29 [colin]	3.9.0cvs30

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

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.359
retrieving revision 1.274.2.360
diff -u -d -r1.274.2.359 -r1.274.2.360
--- mainwindow.c	28 Nov 2012 15:33:12 -0000	1.274.2.359
+++ mainwindow.c	29 Nov 2012 09:56:27 -0000	1.274.2.360
@@ -3414,7 +3414,7 @@
 
 	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 @@
 	&&  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));