[totem] main: Remove skip menu items

[Bastien Nocera <hadess src gnome org>]

commit 369279ea51a9470ede75646461ac0bd4a116a145
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 8 19:12:38 2013 +0200

    main: Remove skip menu items

 data/totem.ui      |   36 ------------------------------------
 src/totem-menu.c   |   12 ------------
 src/totem-object.c |   27 ---------------------------
 3 files changed, 0 insertions(+), 75 deletions(-)
---
diff --git a/data/totem.ui b/data/totem.ui
index 39d8d2d..7ca73df 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -170,11 +170,6 @@
          </child>
 
          <child>
-            <object class="GtkAction" id="go-menu">
-               <property name="label" translatable="yes">_Go</property>
-            </object>
-         </child>
-         <child>
             <object class="GtkAction" id="next-chapter">
                <property name="label" translatable="yes">_Next Chapter/Movie</property>
                <property name="icon-name">media-skip-forward-symbolic</property>
@@ -307,28 +302,6 @@
          </child>
       </object>
    </child>
-   <child>
-      <object class="GtkActionGroup" id="skip-action-group">
-         <child>
-            <object class="GtkAction" id="skip-forward">
-               <property name="label" translatable="yes">Skip _Forward</property>
-               <property name="tooltip" translatable="yes">Skip forward</property>
-               <property name="icon-name">media-seek-forward-symbolic</property>
-               <signal name="activate" handler="skip_forward_action_callback"/>
-            </object>
-            <accelerator key="Right"/>
-         </child>
-         <child>
-            <object class="GtkAction" id="skip-backwards">
-               <property name="label" translatable="yes">Skip _Backwards</property>
-               <property name="tooltip" translatable="yes">Skip backwards</property>
-               <property name="icon-name">media-seek-backward-symbolic</property>
-               <signal name="activate" handler="skip_backwards_action_callback"/>
-            </object>
-            <accelerator key="Left"/>
-         </child>
-      </object>
-   </child>
    <ui>
       <menubar name="tmw-menubar">
          <menu name="movie" action="movie-menu">
@@ -365,13 +338,6 @@
             <menuitem name="sidebar" action="sidebar"/>
             <placeholder name="sidebars-placeholder"/>
          </menu>
-         <menu name="go" action="go-menu">
-            <menuitem name="next-chapter" action="next-chapter"/>
-            <menuitem name="previous-chapter" action="previous-chapter"/>
-            <separator/>
-            <menuitem name="skip-forward" action="skip-forward"/>
-            <menuitem name="skip-backwards" action="skip-backwards"/>
-         </menu>
          <menu name="sound" action="sound-menu">
             <menu name="languages" action="languages-menu">
                <placeholder name="placeholder"/>
@@ -384,8 +350,6 @@
          <menuitem name="play" action="play"/>
          <menuitem name="next-chapter" action="next-chapter"/>
          <menuitem name="previous-chapter" action="previous-chapter"/>
-         <menuitem name="skip-forward" action="skip-forward"/>
-         <menuitem name="skip-backwards" action="skip-backwards"/>
          <menuitem name="select-subtitle" action="select-subtitle"/>
          <separator/>
          <menu name="popup-languages" action="languages-menu">
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 69353a0..d361066 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -597,18 +597,6 @@ totem_ui_manager_setup (Totem *totem)
 {
        totem->main_action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, 
"main-action-group"));
 
-       /* FIXME: Moving these to GtkBuilder depends on bug #457631 */
-       if (gtk_widget_get_direction (totem->win) == GTK_TEXT_DIR_RTL) {
-               GtkActionGroup *action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, 
"skip-action-group"));
-               GtkAction *action;
-
-               action = gtk_action_group_get_action (action_group, "skip-forward");
-               gtk_action_set_accel_path (action, "Left");
-
-               action = gtk_action_group_get_action (action_group, "skip-backwards");
-               gtk_action_set_accel_path (action, "Right");
-       }
-
        totem->ui_manager = GTK_UI_MANAGER (gtk_builder_get_object (totem->xml, "totem-ui-manager"));
 
        totem->devices_action_group = NULL;
diff --git a/src/totem-object.c b/src/totem-object.c
index 0c16d33..8840292 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -2403,8 +2403,6 @@ update_fill (TotemObject *totem, gdouble level)
 static void
 update_seekable (TotemObject *totem)
 {
-       GtkAction *action;
-       GtkActionGroup *action_group;
        gboolean seekable;
 
        seekable = bacon_video_widget_is_seekable (totem->bvw);
@@ -2415,18 +2413,6 @@ update_seekable (TotemObject *totem)
        /* Check if the stream is seekable */
        gtk_widget_set_sensitive (totem->seek, seekable);
 
-       /* FIXME: We can use this code again once bug #457631 is fixed and
-        * skip-* are back in the main action group. */
-       /*totem_action_set_sensitivity ("skip-forward", seekable);
-       totem_action_set_sensitivity ("skip-backwards", seekable);*/
-       action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "skip-action-group"));
-
-       action = gtk_action_group_get_action (action_group, "skip-forward");
-       gtk_action_set_sensitive (action, seekable);
-
-       action = gtk_action_group_get_action (action_group, "skip-backwards");
-       gtk_action_set_sensitive (action, seekable);
-
        /* This is for the session restore and the position saving
         * to seek to the saved time */
        if (seekable != FALSE) {
@@ -3845,7 +3831,6 @@ totem_callback_connect (TotemObject *totem)
        GtkWidget *item, *image, *label;
        GIcon *icon;
        GtkAction *action;
-       GtkActionGroup *action_group;
        GtkBox *box;
        GAction *gaction;
        AtkObject *accessible;
@@ -3953,18 +3938,6 @@ totem_callback_connect (TotemObject *totem)
        totem_action_set_sensitivity ("play", FALSE);
        totem_action_set_sensitivity ("next-chapter", FALSE);
        totem_action_set_sensitivity ("previous-chapter", FALSE);
-       /* FIXME: We can use this code again once bug #457631 is fixed
-        * and skip-* are back in the main action group. */
-       /*totem_action_set_sensitivity ("skip-forward", FALSE);
-       totem_action_set_sensitivity ("skip-backwards", FALSE);*/
-
-       action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "skip-action-group"));
-
-       action = gtk_action_group_get_action (action_group, "skip-forward");
-       gtk_action_set_sensitive (action, FALSE);
-
-       action = gtk_action_group_get_action (action_group, "skip-backwards");
-       gtk_action_set_sensitive (action, FALSE);
 
        /* Volume */
        g_signal_connect (G_OBJECT (totem->bvw), "notify::volume",