[totem] main: Add missing Preferences menu item



commit 1b0b434a848e0abe016c0f2191f384d1c961ccb5
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Apr 22 22:45:21 2012 +0100

    main: Add missing Preferences menu item
    
    Oops, it disappeared.

 src/totem-menu.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 9a18b5c..89e7320 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -46,7 +46,6 @@ G_MODULE_EXPORT void eject_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void properties_action_callback (GtkAction *action, Totem *totem);
 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 preferences_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_1_2_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_1_1_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_2_1_action_callback (GtkAction *action, Totem *totem);
@@ -89,6 +88,14 @@ open_location_action_cb (GSimpleAction *action,
 }
 
 static void
+preferences_action_cb (GSimpleAction *action,
+		       GVariant      *parameter,
+		       gpointer       user_data)
+{
+	gtk_widget_show (TOTEM_OBJECT (user_data)->prefs);
+}
+
+static void
 fullscreen_change_state (GSimpleAction *action,
 			 GVariant      *value,
 			 gpointer       user_data)
@@ -151,6 +158,7 @@ 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 },
+	{ "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 },
 	{ "quit", quit_action_cb, NULL, NULL, NULL },
@@ -737,12 +745,6 @@ quit_action_callback (GtkAction *action, Totem *totem)
 }
 
 void
-preferences_action_callback (GtkAction *action, Totem *totem)
-{
-	gtk_widget_show (totem->prefs);
-}
-
-void
 zoom_1_2_action_callback (GtkAction *action, Totem *totem)
 {
 	totem_action_set_scale_ratio (totem, 0.5);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]