--- data/totem.glade~psion-remove-unused-menu-items.patch 2004-07-03 21:43:50.000000000 +0200 +++ data/totem.glade 2004-11-13 18:00:46.000000000 +0100 @@ -2414,7 +2414,7 @@ True - Totem Movie Player + Totem Media Player GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -2440,7 +2440,7 @@ True - _Movie + _File True @@ -2465,88 +2465,6 @@ - - True - Play a Video DVD - Play _DVD - True - - - - - True - gtk-cdrom - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Play a Video CD - Play _VCD - True - - - - - True - gtk-cdrom - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Play an audio CD - Play _Audio CD - True - - - - - True - gtk-cdrom - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - _Eject - True - - - - - - True @@ -2937,225 +2855,6 @@ - - - True - _Go - True - - - - - - - - True - Go to the DVD menu - _DVD Menu - True - - - - - - True - gtk-index - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Go to the title menu - _Title Menu - True - - - - - - - True - Go to the audio menu - A_udio Menu - True - - - - - - - True - Go to the angle menu - _Angle Menu - True - - - - - - - True - Go to the chapter menu - _Chapter Menu - True - - - - - - True - gnome-stock-text-numbered-list - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Next chapter or movie - _Next Chapter/Movie - True - - - - - - True - gtk-goto-last - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Previous chapter or movie - _Previous Chapter/Movie - True - - - - - - True - gtk-goto-first - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - False - Skip to a specific time - _Skip to... - True - - - - - - True - gtk-jump-to - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - Skip forward - Skip _Forward - True - - - - - - True - gtk-go-forward - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - Skip backwards - Skip _Backwards - True - - - - - - True - gtk-go-back - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - @@ -3191,51 +2890,6 @@ - - - True - Volume up - Volume _Up - True - - - - - - True - gnome-stock-volume - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Volume down - Volume _Down - True - - - - - - True - gnome-stock-volume - 1 - 0.5 - 0.5 - 0 - 0 - - - - --- src/totem.c~psion-remove-unused-menu-items.patch 2004-07-22 23:31:48.000000000 +0200 +++ src/totem.c 2004-11-13 17:49:13.000000000 +0100 @@ -682,7 +682,7 @@ g_free (text); /* Title */ - text = g_strdup_printf (_("%s - Totem Movie Player"), name); + text = g_strdup_printf (_("%s - Totem Media Player"), name); gtk_window_set_title (GTK_WINDOW (totem->win), text); g_free (text); } else { @@ -707,7 +707,7 @@ g_free (text); /* Title */ - gtk_window_set_title (GTK_WINDOW (totem->win), _("Totem Movie Player")); + gtk_window_set_title (GTK_WINDOW (totem->win), _("Totem Media Player")); } } @@ -809,10 +809,6 @@ caps = bacon_video_widget_can_set_volume (totem->bvw); widget = glade_xml_get_widget (totem->xml, "tmw_volume_hbox"); gtk_widget_set_sensitive (widget, caps); - widget = glade_xml_get_widget (totem->xml, "tmw_volume_up_menu_item"); - gtk_widget_set_sensitive (widget, caps); - widget = glade_xml_get_widget (totem->xml, "tmw_volume_down_menu_item"); - gtk_widget_set_sensitive (widget, caps); widget = glade_xml_get_widget (totem->xml, "tcw_volume_hbox"); gtk_widget_set_sensitive (widget, caps); @@ -1294,18 +1290,10 @@ widget = glade_xml_get_widget (totem->xml, "tcw_time_hbox"); gtk_widget_set_sensitive (widget, seekable); - widget = glade_xml_get_widget (totem->xml, - "tmw_skip_forward_menu_item"); - gtk_widget_set_sensitive (widget, seekable); - 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"); gtk_widget_set_sensitive (widget, seekable); widget = glade_xml_get_widget (totem->xml, "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); widget = glade_xml_get_widget (totem->xml, "tstw_ok_button"); gtk_widget_set_sensitive (widget, seekable); } @@ -2797,17 +2785,6 @@ playing = totem_playing_dvd (totem); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_root_menu_item"); - gtk_widget_set_sensitive (item, playing); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_title_menu_item"); - gtk_widget_set_sensitive (item, playing); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_audio_menu_item"); - gtk_widget_set_sensitive (item, playing); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_angle_menu_item"); - gtk_widget_set_sensitive (item, playing); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_chapter_menu_item"); - gtk_widget_set_sensitive (item, playing); - playing = totem_is_media (totem->mrl); item = glade_xml_get_widget (totem->xml, "tmw_eject_menu_item"); @@ -2833,9 +2810,6 @@ gtk_widget_set_sensitive (item, has_item); item = glade_xml_get_widget (totem->xml, "tcw_previous_button"); gtk_widget_set_sensitive (item, has_item); - 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"); gtk_widget_set_sensitive (item, has_item); @@ -2852,8 +2826,6 @@ gtk_widget_set_sensitive (item, has_item); item = glade_xml_get_widget (totem->xml, "tcw_next_button"); 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"); gtk_widget_set_sensitive (item, has_item); } @@ -3039,18 +3011,6 @@ item = glade_xml_get_widget (totem->xml, "tmw_open_location_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_open_location1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_play_dvd_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_play_dvd1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_play_vcd_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_play_vcd1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_play_audio_cd_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_play_cd1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_eject_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_eject1_activate), totem); item = glade_xml_get_widget (totem->xml, "tmw_play_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_play1_activate), totem); @@ -3125,12 +3085,6 @@ item = glade_xml_get_widget (totem->xml, "tmw_properties_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_properties1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_volume_up_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_volume_up1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_volume_down_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_volume_down1_activate), totem); item = glade_xml_get_widget (totem->xml, "tmw_always_on_top_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_always_on_top1_activate), totem); @@ -3317,40 +3271,6 @@ G_CALLBACK (playlist_shuffle_toggle_cb), totem); - /* DVD menu callbacks */ - item = glade_xml_get_widget (totem->xml, "tmw_dvd_root_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_dvd_root_menu1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_title_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_dvd_title_menu1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_audio_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_dvd_audio_menu1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_angle_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_dvd_angle_menu1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_dvd_chapter_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_dvd_chapter_menu1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_skip_to_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_skip_to1_activate), totem); - item = glade_xml_get_widget (totem->xml, "tmw_next_chapter_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_next_button_clicked), totem); - item = glade_xml_get_widget (totem->xml, - "tmw_previous_chapter_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_previous_button_clicked), totem); - item = glade_xml_get_widget (totem->xml, "tmw_skip_forward_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_skip_forward1_activate), totem); - item = glade_xml_get_widget (totem->xml, - "tmw_skip_backwards_menu_item"); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (on_skip_backwards1_activate), totem); - /* Skip dialog */ item = glade_xml_get_widget (totem->xml, "totem_skip_to_window"); g_signal_connect (G_OBJECT (item), "response", @@ -3696,7 +3616,7 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - g_set_application_name (_("Totem Movie Player")); + g_set_application_name (_("Totem Media Player")); if (XInitThreads () == 0) {