main: Move Go menu contents to controls bar

1 files changed, 45 insertions, 35 deletions

diff --git a/src/totem-menu.c b/src/totem-menu.c
index d0de41168..69353a00a 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -47,11 +47,6 @@ G_MODULE_EXPORT void play_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void quit_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_toggle_action_callback (GtkToggleAction *action, Totem *totem);
 G_MODULE_EXPORT void next_angle_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void dvd_root_menu_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void dvd_title_menu_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void dvd_audio_menu_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void dvd_angle_menu_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void next_chapter_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void previous_chapter_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void skip_forward_action_callback (GtkAction *action, Totem *totem);
@@ -154,10 +149,55 @@ quit_action_cb (GSimpleAction *action,
 	totem_object_action_exit (TOTEM_OBJECT (user_data));
 }
 
+static void
+dvd_root_menu_action_cb (GSimpleAction *action,
+			 GVariant      *parameter,
+			 gpointer       user_data)
+{
+        bacon_video_widget_dvd_event (TOTEM_OBJECT (user_data)->bvw, BVW_DVD_ROOT_MENU);
+}
+
+static void
+dvd_title_menu_action_cb (GSimpleAction *action,
+			  GVariant      *parameter,
+			  gpointer       user_data)
+{
+        bacon_video_widget_dvd_event (TOTEM_OBJECT (user_data)->bvw, BVW_DVD_TITLE_MENU);
+}
+
+static void
+dvd_audio_menu_action_cb (GSimpleAction *action,
+			  GVariant      *parameter,
+			  gpointer       user_data)
+{
+        bacon_video_widget_dvd_event (TOTEM_OBJECT (user_data)->bvw, BVW_DVD_AUDIO_MENU);
+}
+
+static void
+dvd_angle_menu_action_cb (GSimpleAction *action,
+			  GVariant      *parameter,
+			  gpointer       user_data)
+{
+        bacon_video_widget_dvd_event (TOTEM_OBJECT (user_data)->bvw, BVW_DVD_ANGLE_MENU);
+}
+
+static void
+dvd_chapter_menu_action_cb (GSimpleAction *action,
+			    GVariant      *parameter,
+			    gpointer       user_data)
+{
+        bacon_video_widget_dvd_event (TOTEM_OBJECT (user_data)->bvw, BVW_DVD_CHAPTER_MENU);
+}
+
 static GActionEntry app_entries[] = {
 	{ "open", open_action_cb, NULL, NULL, NULL },
 	{ "open-location", open_location_action_cb, NULL, NULL, NULL },
 	{ "fullscreen", toggle_action_cb, NULL, "false", fullscreen_change_state },
+	{ "dvd-root-menu", dvd_root_menu_action_cb, NULL, NULL, NULL },
+	{ "dvd-title-menu", dvd_title_menu_action_cb, NULL, NULL, NULL },
+	{ "dvd-audio-menu", dvd_audio_menu_action_cb, NULL, NULL, NULL },
+	{ "dvd-angle-menu", dvd_angle_menu_action_cb, NULL, NULL, NULL },
+	{ "dvd-chapter-menu", dvd_chapter_menu_action_cb, NULL, NULL, NULL },
 	{ "preferences", preferences_action_cb, NULL, NULL, NULL },
 	{ "shuffle", toggle_action_cb, NULL, "false", shuffle_change_state },
 	{ "repeat", toggle_action_cb, NULL, "false", repeat_change_state },
@@ -494,36 +534,6 @@ next_angle_action_callback (GtkAction *action, Totem *totem)
 }
 
 void
-dvd_root_menu_action_callback (GtkAction *action, Totem *totem)
-{
-        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU);
-}
-
-void
-dvd_title_menu_action_callback (GtkAction *action, Totem *totem)
-{
-        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_TITLE_MENU);
-}
-
-void
-dvd_audio_menu_action_callback (GtkAction *action, Totem *totem)
-{
-        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_AUDIO_MENU);
-}
-
-void
-dvd_angle_menu_action_callback (GtkAction *action, Totem *totem)
-{
-        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ANGLE_MENU);
-}
-
-void
-dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem)
-{
-        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_CHAPTER_MENU);
-}
-
-void
 next_chapter_action_callback (GtkAction *action, Totem *totem)
 {
 	TOTEM_PROFILE (totem_object_action_next (totem));