talons

commit 08afd46c3d7d062e1dd8ce1f0bd8bc478ca50450
parent 8fda822ba331565dcd1755536811f34319e88c17
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  2 Aug 2008 20:11:53 +0000

2008-08-02 [colin]	3.5.0cvs46

	* src/mainwindow.c
		Fix toggle menu activation state
		(thanks to cvs45 ;)

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

4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-02 [colin]	3.5.0cvs46
+
+	* src/mainwindow.c
+		Fix toggle menu activation state
+		(thanks to cvs45 ;)
+
 2008-08-02 [paul]	3.5.0cvs45
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3457,3 +3457,4 @@
 ( cvs diff -u -r 1.5.2.77 -r 1.5.2.78 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/gtkvscrollbutton.c;  ) > 3.5.0cvs43.patchset
 ( cvs diff -u -r 1.36.2.142 -r 1.36.2.143 src/common/utils.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/claws.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/claws.def;  ) > 3.5.0cvs44.patchset
 ( cvs diff -u -r 1.274.2.260 -r 1.274.2.261 src/mainwindow.c;  ) > 3.5.0cvs45.patchset
+( cvs diff -u -r 1.274.2.261 -r 1.274.2.262 src/mainwindow.c;  ) > 3.5.0cvs46.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3168,6 +3168,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
 	main_window_menu_callback_block(mainwin);
 
+	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView",
+			      messageview_is_visible(mainwin->messageview));
+
 	summaryview = mainwin->summaryview;
 	menu_path = "Menu/View/Sort/DontSort";
 
@@ -3204,12 +3207,12 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 	default:
 		menu_path = "Menu/View/Sort/DontSort"; break;
 	}
-	cm_menu_set_sensitive_full(mainwin->ui_manager, menu_path, TRUE);
+	cm_toggle_menu_set_active_full(mainwin->ui_manager, menu_path, TRUE);
 
 	if (summaryview->sort_type == SORT_ASCENDING) {
-		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Sort/Ascending", TRUE);
+		cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Sort/Ascending", TRUE);
 	} else {
-		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Sort/Descending", TRUE);
+		cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Sort/Descending", TRUE);
 	}
 
 	if (summaryview->sort_key != SORT_BY_NONE) {
@@ -3223,7 +3226,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 	if (mainwin->messageview 
 	&&  mainwin->messageview->mimeview
 	&&  mainwin->messageview->mimeview->textview)
-		cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/AllHeaders",
+		cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders",
 			      mainwin->messageview->mimeview->textview->show_all_headers);
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0);
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1));