? INSTALL
? install-sh
? missing
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/totem/ChangeLog,v
retrieving revision 1.1156
diff -p -u -r1.1156 ChangeLog
--- ChangeLog	12 Feb 2005 04:09:15 -0000	1.1156
+++ ChangeLog	13 Feb 2005 19:46:39 -0000
@@ -1,3 +1,12 @@
+2005-02-13  William Jon McCann  <mccann@jhu.edu>
+
+	* src/totem-playlist.c (totem_playlist_new): 
+	* src/totem-interface.c (totem_interface_load): 
+	* src/totem.c (totem_action_menu_popup)
+	(totem_action_set_mrl_with_warning, on_open_location1_activate) 
+	(show_controls, update_buttons, totem_callback_connect, main): 
+	Workaround menu accels not being displayed.  (Closes #153594)
+
 2005-02-11  William Jon McCann  <mccann@jhu.edu>
 
 	* src/totem.c (popup_timeout_remove) 
Index: src/totem-interface.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-interface.c,v
retrieving revision 1.3
diff -p -u -r1.3 totem-interface.c
--- src/totem-interface.c	8 Feb 2005 18:04:14 -0000	1.3
+++ src/totem-interface.c	13 Feb 2005 19:46:40 -0000
@@ -92,8 +92,11 @@ totem_interface_error_blocking (const ch
 }
 
 GladeXML *
-totem_interface_load (const char *name, const char *display_name,
-		gboolean fatal, GtkWindow *parent)
+totem_interface_load (const char *name,
+                      const char *root,
+                      const char *display_name,
+                      gboolean    fatal,
+                      GtkWindow  *parent)
 {
 	GladeXML *glade;
 	char *filename;
@@ -102,7 +105,7 @@ totem_interface_load (const char *name, 
 	filename = totem_interface_get_full_path (name);
 
 	if (filename != NULL)
-		glade = glade_xml_new (filename, NULL, NULL);
+		glade = glade_xml_new (filename, root, NULL);
 	g_free (filename);
 
 	if (glade == NULL)
Index: src/totem-interface.h
===================================================================
RCS file: /cvs/gnome/totem/src/totem-interface.h,v
retrieving revision 1.1
diff -p -u -r1.1 totem-interface.h
--- src/totem-interface.h	12 Jan 2005 17:56:46 -0000	1.1
+++ src/totem-interface.h	13 Feb 2005 19:46:40 -0000
@@ -32,6 +32,7 @@ GdkPixbuf	*totem_interface_load_pixbuf	(
 char		*totem_interface_get_full_path	(const char *name);
 GladeXML	*totem_interface_load		(const char *name,
 						 const char *display_name,
+						 const char *root,
 						 gboolean fatal,
 						 GtkWindow *parent);
 void		 totem_interface_error		(const char *title,
Index: src/totem-playlist.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-playlist.c,v
retrieving revision 1.63
diff -p -u -r1.63 totem-playlist.c
--- src/totem-playlist.c	24 Jan 2005 16:22:42 -0000	1.63
+++ src/totem-playlist.c	13 Feb 2005 19:46:41 -0000
@@ -1471,7 +1471,7 @@ totem_playlist_new (void)
 
 	playlist = TOTEM_PLAYLIST (g_object_new (GTK_TYPE_PLAYLIST, NULL));
 
-	playlist->_priv->xml = totem_interface_load ("playlist.glade",
+	playlist->_priv->xml = totem_interface_load ("playlist.glade", NULL,
 			"playlist", TRUE, NULL);
 
 	if (playlist->_priv->xml == NULL)
Index: src/totem-private.h
===================================================================
RCS file: /cvs/gnome/totem/src/totem-private.h,v
retrieving revision 1.25
diff -p -u -r1.25 totem-private.h
--- src/totem-private.h	8 Feb 2005 18:04:14 -0000	1.25
+++ src/totem-private.h	13 Feb 2005 19:46:41 -0000
@@ -56,6 +56,7 @@ typedef enum {
 struct Totem {
 	/* Control window */
 	GladeXML *xml;
+	GladeXML *xml_popup;
 	GtkWidget *win;
 	BaconVideoWidget *bvw;
 	GtkWidget *prefs;
Index: src/totem.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem.c,v
retrieving revision 1.406
diff -p -u -r1.406 totem.c
--- src/totem.c	12 Feb 2005 04:09:16 -0000	1.406
+++ src/totem.c	13 Feb 2005 19:46:43 -0000
@@ -199,8 +199,7 @@ totem_action_menu_popup (Totem *totem, g
 {
 	GtkWidget *menu;
 
-	menu = glade_xml_get_widget (totem->xml,
-			"totem_right_click_menu");
+	menu = glade_xml_get_widget (totem->xml_popup, "totem_right_click_menu");
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
 			button, gtk_get_current_event_time ());
 }
@@ -602,7 +601,7 @@ totem_action_set_mrl_with_warning (Totem
 		widget = glade_xml_get_widget (totem->xml, "tmw_play_menu_item");
 		gtk_widget_set_sensitive (widget, FALSE);
 
-		widget = glade_xml_get_widget (totem->xml, "trcm_play");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_play");
 		gtk_widget_set_sensitive (widget, FALSE);
 
 		/* Seek bar and seek buttons */
@@ -615,9 +614,9 @@ totem_action_set_mrl_with_warning (Totem
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = glade_xml_get_widget (totem->xml, "tmw_volume_down_menu_item");
 		gtk_widget_set_sensitive (widget, FALSE);
-		widget = glade_xml_get_widget (totem->xml, "trcm_volume_up");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_volume_up");
 		gtk_widget_set_sensitive (widget, FALSE);
-		widget = glade_xml_get_widget (totem->xml, "trcm_volume_down");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_volume_down");
 		gtk_widget_set_sensitive (widget, FALSE);
 
 		/* Control popup */
@@ -628,9 +627,9 @@ totem_action_set_mrl_with_warning (Totem
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = glade_xml_get_widget (totem->xml, "tcw_next_button"); 
 		gtk_widget_set_sensitive (widget, FALSE);
-		widget = glade_xml_get_widget (totem->xml, "trcm_next_chapter");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_next_chapter");
 		gtk_widget_set_sensitive (widget, FALSE);
-		widget = glade_xml_get_widget (totem->xml, "trcm_previous_chapter");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_previous_chapter");
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = glade_xml_get_widget (totem->xml, "tcw_volume_hbox");
 		gtk_widget_set_sensitive (widget, FALSE);
@@ -665,7 +664,7 @@ totem_action_set_mrl_with_warning (Totem
 		gtk_widget_set_sensitive (totem->pp_button, TRUE);
 		widget = glade_xml_get_widget (totem->xml, "tmw_play_menu_item");
 		gtk_widget_set_sensitive (widget, TRUE);
-		widget = glade_xml_get_widget (totem->xml, "trcm_play");
+		widget = glade_xml_get_widget (totem->xml_popup, "trcm_play");
 		gtk_widget_set_sensitive (widget, TRUE);
 		gtk_widget_set_sensitive (totem->fs_pp_button, TRUE);
 
@@ -1185,9 +1184,9 @@ update_seekable (Totem *totem, gboolean 
 	widget = glade_xml_get_widget (totem->xml,
 			"tmw_skip_backwards_menu_item");
 	gtk_widget_set_sensitive (widget, seekable);
-	widget = glade_xml_get_widget (totem->xml, "trcm_skip_forward");
+	widget = glade_xml_get_widget (totem->xml_popup, "trcm_skip_forward");
 	gtk_widget_set_sensitive (widget, seekable);
-	widget = glade_xml_get_widget (totem->xml, "trcm_skip_backwards");
+	widget = glade_xml_get_widget (totem->xml_popup, "trcm_skip_backwards");
 	gtk_widget_set_sensitive (widget, seekable);
 	widget = glade_xml_get_widget (totem->xml, "tmw_skip_to_menu_item");
 	gtk_widget_set_sensitive (widget, seekable);
@@ -1546,7 +1545,7 @@ on_open_location1_activate (GtkButton *b
 	int response;
 	const char *filenames[2];
 
-	glade = totem_interface_load ("uri.glade", "Open Location...",
+	glade = totem_interface_load ("uri.glade", NULL, "Open Location...",
 			FALSE, GTK_WINDOW (totem->win));
 	if (glade == NULL)
 		return;
@@ -1747,7 +1746,7 @@ show_controls (Totem *totem, gboolean wa
 	menubar = glade_xml_get_widget (totem->xml, "tmw_menubar");
 	controlbar = glade_xml_get_widget (totem->xml, "tmw_controls_vbox");
 	statusbar = glade_xml_get_widget (totem->xml, "tmw_statusbar");
-	item = glade_xml_get_widget (totem->xml, "trcm_show_controls");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_show_controls");
 	bvw_vbox = glade_xml_get_widget (totem->xml, "tmw_bvw_vbox");
 	widget = GTK_WIDGET (totem->bvw);
 
@@ -2784,7 +2783,7 @@ update_buttons (Totem *totem)
 	item = glade_xml_get_widget (totem->xml,
 			"tmw_previous_chapter_menu_item");
 	gtk_widget_set_sensitive (item, has_item);
-	item = glade_xml_get_widget (totem->xml, "trcm_previous_chapter");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_previous_chapter");
 	gtk_widget_set_sensitive (item, has_item);
 
 	/* Next */
@@ -2802,7 +2801,7 @@ update_buttons (Totem *totem)
 	gtk_widget_set_sensitive (item, has_item);
 	item = glade_xml_get_widget (totem->xml, "tmw_next_chapter_menu_item");
 	gtk_widget_set_sensitive (item, has_item);
-	item = glade_xml_get_widget (totem->xml, "trcm_next_chapter");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_next_chapter");
 	gtk_widget_set_sensitive (item, has_item);
 }
 
@@ -2960,28 +2959,28 @@ totem_callback_connect (Totem *totem)
 			G_CALLBACK (on_show_controls1_activate), totem);
 
 	/* Popup menu */
-	item = glade_xml_get_widget (totem->xml, "trcm_play");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_play");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_play1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_next_chapter");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_next_chapter");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_next_button_clicked), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_previous_chapter");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_previous_chapter");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_previous_button_clicked), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_skip_forward");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_skip_forward");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_skip_forward1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_skip_backwards");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_skip_backwards");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_skip_backwards1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_volume_up");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_volume_up");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_volume_up1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_volume_down");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_volume_down");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_volume_down1_activate), totem);
-	item = glade_xml_get_widget (totem->xml, "trcm_show_controls");
+	item = glade_xml_get_widget (totem->xml_popup, "trcm_show_controls");
 	g_signal_connect (G_OBJECT (item), "activate",
 			G_CALLBACK (on_show_controls2_activate), totem);
 
@@ -3434,9 +3433,13 @@ main (int argc, char **argv)
 	totem->gc = gc;
 
 	/* Main window */
-	totem->xml = totem_interface_load ("totem.glade", "main window",
+	totem->xml = totem_interface_load ("totem.glade", NULL, "main window",
 			TRUE, NULL);
 	if (totem->xml == NULL)
+		totem_action_exit (NULL);
+	totem->xml_popup = totem_interface_load ("totem.glade", "totem_right_click_menu", "right click popup menu",
+			TRUE, NULL);
+	if (totem->xml_popup == NULL)
 		totem_action_exit (NULL);
 
 	totem->win = glade_xml_get_widget (totem->xml, "totem_main_window");
