[totem] main: Remove last bits of Properties in main



commit 2f57b558b1103a6825130c1d3c18bb4239626eec
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jan 24 16:58:15 2014 +0100

    main: Remove last bits of Properties in main

 src/plugins/properties/totem-movie-properties.c |    1 +
 src/totem-menu.c                                |    9 ---------
 src/totem-object.c                              |   19 +------------------
 3 files changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/src/plugins/properties/totem-movie-properties.c b/src/plugins/properties/totem-movie-properties.c
index edd25b2..6f3175a 100644
--- a/src/plugins/properties/totem-movie-properties.c
+++ b/src/plugins/properties/totem-movie-properties.c
@@ -280,6 +280,7 @@ impl_activate (PeasActivatable *plugin)
                                         "<Primary>p",
                                         "app.properties",
                                         NULL);
+       /* FIXME: Handle GDK_KEY_View */
 
        /* Install the menu */
        menu = totem_object_get_menu_section (totem, "properties-placeholder");
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 21fd61c..6aff5db 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -235,14 +235,6 @@ next_angle_action_cb (GSimpleAction *action,
 }
 
 static void
-properties_action_cb (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data)
-{
-        totem_object_show_properties (TOTEM_OBJECT (user_data));
-}
-
-static void
 eject_action_cb (GSimpleAction *action,
                 GVariant      *parameter,
                 gpointer       user_data)
@@ -283,7 +275,6 @@ static GActionEntry app_entries[] = {
        { "aspect-ratio", list_action_cb, "i", "0", aspect_ratio_change_state },
        { "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 },
 };
 
diff --git a/src/totem-object.c b/src/totem-object.c
index 036b985..1cdb633 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -1313,16 +1313,6 @@ totem_object_eject (TotemObject *totem)
        g_object_unref (mount);
 }
 
-void
-totem_object_show_properties (TotemObject *totem)
-{
-       /* FIXME Implement showing properties */
-#if 0
-       if (totem_object_is_fullscreen (totem) == FALSE)
-               totem_sidebar_set_current_page (totem, "properties", TRUE);
-#endif
-}
-
 /**
  * totem_object_play:
  * @totem: a #TotemObject
@@ -3181,11 +3171,7 @@ totem_object_handle_key_press (TotemObject *totem, GdkEventKey *event)
        case GDK_KEY_AudioPlay:
        case GDK_KEY_p:
        case GDK_KEY_P:
-               if (event->state & GDK_CONTROL_MASK) {
-                       totem_object_show_properties (totem);
-               } else {
-                       totem_object_play_pause (totem);
-               }
+               totem_object_play_pause (totem);
                break;
        case GDK_KEY_comma:
        case GDK_KEY_FrameBack:
@@ -3284,9 +3270,6 @@ totem_object_handle_key_press (TotemObject *totem, GdkEventKey *event)
                if (bacon_video_widget_has_menus (totem->bvw) != FALSE)
                        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_SELECT);
                break;
-       case GDK_KEY_View:
-               totem_object_show_properties (totem);
-               break;
        case GDK_KEY_0:
                if (event->state & GDK_CONTROL_MASK)
                        totem_object_set_zoom (totem, FALSE);


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