Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22786

Modified Files:
      Tag: hxclient_3_1_0_atlas
	contextmenu.cpp contextmenu_interface.c 
Log Message:
Fix for bug 8793

Index: contextmenu_interface.c
===================================================================
RCS file: /cvsroot/player/app/gtk/contextmenu_interface.c,v
retrieving revision 1.9
retrieving revision 1.9.16.1
diff -u -d -r1.9 -r1.9.16.1
--- contextmenu_interface.c	17 Jun 2005 23:08:20 -0000	1.9
+++ contextmenu_interface.c	10 Oct 2008 06:33:35 -0000	1.9.16.1
@@ -42,7 +42,6 @@
   GtkWidget *hcm_show_separator;
   GtkWidget *hcm_show_menu_and_caption_menu_item;
   GtkWidget *hcm_show_controls_menu_item;
-  GtkWidget *hcm_show_status_bar_menu_item;
   GtkWidget *hcm_play_in_external_player_menu_item;
 
   hxplayer_context_menu = gtk_menu_new ();
@@ -111,11 +110,6 @@
   gtk_widget_show (hcm_show_controls_menu_item);
   gtk_container_add (GTK_CONTAINER (hxplayer_context_menu), hcm_show_controls_menu_item);
 
-  hcm_show_status_bar_menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Status Bar"));
-  gtk_widget_set_name (hcm_show_status_bar_menu_item, "hcm_show_status_bar_menu_item");
-  gtk_widget_show (hcm_show_status_bar_menu_item);
-  gtk_container_add (GTK_CONTAINER (hxplayer_context_menu), hcm_show_status_bar_menu_item);
-
   hcm_play_in_external_player_menu_item = gtk_menu_item_new_with_mnemonic (_("Play in E_xternal Player"));
   gtk_widget_set_name (hcm_play_in_external_player_menu_item, "hcm_play_in_external_player_menu_item");
   gtk_widget_show (hcm_play_in_external_player_menu_item);
@@ -135,7 +129,6 @@
   GLADE_HOOKUP_OBJECT (hxplayer_context_menu, hcm_show_separator, "hcm_show_separator");
   GLADE_HOOKUP_OBJECT (hxplayer_context_menu, hcm_show_menu_and_caption_menu_item, "hcm_show_menu_and_caption_menu_item");
   GLADE_HOOKUP_OBJECT (hxplayer_context_menu, hcm_show_controls_menu_item, "hcm_show_controls_menu_item");
-  GLADE_HOOKUP_OBJECT (hxplayer_context_menu, hcm_show_status_bar_menu_item, "hcm_show_status_bar_menu_item");
   GLADE_HOOKUP_OBJECT (hxplayer_context_menu, hcm_play_in_external_player_menu_item, "hcm_play_in_external_player_menu_item");
 
   return hxplayer_context_menu;

Index: contextmenu.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/contextmenu.cpp,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- contextmenu.cpp	3 Sep 2008 20:58:56 -0000	1.10.2.3
+++ contextmenu.cpp	10 Oct 2008 06:33:35 -0000	1.10.2.4
@@ -246,7 +246,7 @@
     
     menu->show_menu_and_caption_menu_item = gladeemu_xml_get_widget(xml, "hcm_show_menu_and_caption_menu_item");
     menu->show_controls_menu_item         = gladeemu_xml_get_widget(xml, "hcm_show_controls_menu_item");
-    menu->show_status_bar_menu_item       = gladeemu_xml_get_widget(xml, "hcm_show_status_bar_menu_item");
+//    menu->show_status_bar_menu_item       = gladeemu_xml_get_widget(xml, "hcm_show_status_bar_menu_item");
 
     menu->play_in_external_player_menu_item = gladeemu_xml_get_widget(xml,"hcm_play_in_external_player_menu_item");
 
@@ -300,8 +300,8 @@
     g_signal_connect_swapped(G_OBJECT(menu->show_controls_menu_item), "activate",
                              G_CALLBACK(hcm_show_controls), menu);
 
-    g_signal_connect_swapped(G_OBJECT(menu->show_status_bar_menu_item), "activate",
-                             G_CALLBACK(hcm_show_status_bar), menu);
+//    g_signal_connect_swapped(G_OBJECT(menu->show_status_bar_menu_item), "activate",
+//                             G_CALLBACK(hcm_show_status_bar), menu);
 
     return menu;
 }