diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-05-10 18:21:57 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-05-10 18:21:57 +0200 |
| commit | 87d077f6d8436c660ef15023b69af86d929d2cf7 (patch) | |
| tree | 1a0ead00df7b99bfb331f8da2d8ebe8f37a55496 /src/totem-menu.c | |
| parent | cbf5c9b4ada7270d0f89b9cb56788a820a83e1c0 (diff) | |
| download | totem-87d077f6d8436c660ef15023b69af86d929d2cf7.tar.gz | |
main: Move Eject to the cogwheel menu
Diffstat (limited to 'src/totem-menu.c')
| -rw-r--r-- | src/totem-menu.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/totem-menu.c b/src/totem-menu.c index 224baa94a..58933ccca 100644 --- a/src/totem-menu.c +++ b/src/totem-menu.c @@ -41,7 +41,6 @@ #define TOTEM_MAX_RECENT_ITEM_LEN 40 /* Callback functions for GtkBuilder */ -G_MODULE_EXPORT void eject_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 next_chapter_action_callback (GtkAction *action, Totem *totem); @@ -234,6 +233,14 @@ properties_action_cb (GSimpleAction *action, totem_action_show_properties (TOTEM_OBJECT (user_data)); } +static void +eject_action_cb (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + totem_action_eject (TOTEM_OBJECT (user_data)); +} + static GActionEntry app_entries[] = { /* Main app menu */ { "open", open_action_cb, NULL, NULL, NULL }, @@ -257,6 +264,7 @@ static GActionEntry app_entries[] = { { "zoom", toggle_action_cb, NULL, "false", zoom_action_change_state }, { "next-angle", next_angle_action_cb, NULL, NULL, NULL }, { "properties", properties_action_cb, NULL, NULL, NULL }, + { "eject", eject_action_cb, NULL, NULL, NULL }, }; void @@ -273,6 +281,7 @@ totem_app_menu_setup (Totem *totem) gtk_application_add_accelerator (GTK_APPLICATION (totem), "<Primary>G", "app.next-angle", NULL); gtk_application_add_accelerator (GTK_APPLICATION (totem), "<Primary>M", "app.next-angle", NULL); gtk_application_add_accelerator (GTK_APPLICATION (totem), "<Primary>P", "app.properties", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (totem), "<Primary>E", "app.eject", NULL); gtk_window_set_application (GTK_WINDOW (totem->win), GTK_APPLICATION (totem)); } @@ -548,12 +557,6 @@ totem_sublang_exit (Totem *totem) } void -eject_action_callback (GtkAction *action, Totem *totem) -{ - totem_action_eject (totem); -} - -void play_action_callback (GtkAction *action, Totem *totem) { totem_object_action_play_pause (totem); |