[xine-cvs] CVS: gnome-xine/src menu.c,1.32,1.33

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7493/src

Modified Files:
	menu.c 
Log Message:
Fix initial state of toolbar menu items.


Index: menu.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- menu.c	14 Dec 2004 23:52:38 -0000	1.32
+++ menu.c	15 Dec 2004 19:23:19 -0000	1.33
@@ -373,7 +373,7 @@
   { N_("/File/_Quit"),			"<control>Q",	exit_cb, 0,		STOCK(QUIT) },
   { N_("/_View"),			NULL,		NULL, 0,		"<Branch>" },
   { N_("/View/_Fullscreen mode"),	"<control>F",	fullscreen_cb, 0,	"<CheckItem>" },
-  { N_("/View/_Fullscreen toolbar"),	NULL,		NULL, 0,		"<Branch>" },
+  { N_("/View/Fullscreen _toolbar"),	NULL,		NULL, 0,		"<Branch>" },
   { N_("/View/Fullscreen toolbar/_Visible"),	NULL,	tbar_toggle_cb, 0,	"<CheckItem>" },
   { N_("/View/Fullscreen toolbar/At _top"),	NULL,	tbar_position_cb, 1,	"<RadioItem>" },
   { N_("/View/Fullscreen toolbar/At _bottom"),	NULL,	tbar_position_cb, 0,	"/View/Fullscreen toolbar/At top" },
@@ -492,9 +492,9 @@
     toolbar_item[2][i] = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Fullscreen toolbar/At top"));
     if (xine_config_lookup_entry (xine, "gui.fullscreen_toolbar", &entry))
     {
-      toolbar_item[0][i]->active = !(entry.num_value & 1);
-      toolbar_item[1][i]->active = (entry.num_value >> 1) & 1;
-      toolbar_item[2][i]->active = !toolbar_item[1][i];
+      toolbar_item[0][i]->active = (entry.num_value >> 1) & 1;
+      toolbar_item[1][i]->active = (entry.num_value & 1);
+      toolbar_item[2][i]->active = !(entry.num_value & 1);
     }
 
     none_item = GTK_RADIO_MENU_ITEM (gtk_item_factory_get_item (item_factory[i], "/View/Aspect ratio/Auto"));