[totem] main: Remove right-click popup

[Bastien Nocera <hadess src gnome org>]

commit a68275eea3ca8f78cdc7699417523f2b9e742b62
Author: Bastien Nocera <hadess hadess net>
Date:   Tue May 14 19:00:32 2013 +0200

    main: Remove right-click popup
    
    The cogwheel menu is visible in fullscreen and will contain
    pretty much everything the popup did.

 data/totem.ui      |   12 ------------
 src/totem-menu.c   |    4 ++--
 src/totem-object.c |   21 ++++-----------------
 3 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/data/totem.ui b/data/totem.ui
index 896a100..9fe1be9 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -267,18 +267,6 @@
             </menu>
          </menu>
       </menubar>
-      <popup name="totem-main-popup">
-         <menuitem name="next-chapter" action="next-chapter"/>
-         <menuitem name="previous-chapter" action="previous-chapter"/>
-         <menuitem name="select-subtitle" action="select-subtitle"/>
-         <separator/>
-         <menu name="popup-languages" action="languages-menu">
-            <placeholder name="placeholder"/>
-         </menu>
-         <menu name="popup-subtitles" action="subtitles-menu">
-            <placeholder name="placeholder"/>
-         </menu>
-      </popup>
    </ui>
 </object>
 
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 6741b76..69d59ae 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -449,7 +449,7 @@ static void
 totem_languages_update (Totem *totem, GList *list)
 {
        GtkAction *action;
-       const char *paths[3] = { "/tmw-menubar/sound/languages/placeholder", 
"/totem-main-popup/popup-languages/placeholder", NULL };
+       const char *paths[3] = { "/tmw-menubar/sound/languages/placeholder", NULL };
        int current;
 
        /* Remove old UI */
@@ -489,7 +489,7 @@ totem_subtitles_update (Totem *totem, GList *list)
 {
        GtkAction *action;
        int current;
-       const char *paths[3] = { "/tmw-menubar/view/subtitles/placeholder", 
"/totem-main-popup/popup-subtitles/placeholder", NULL };
+       const char *paths[3] = { "/tmw-menubar/view/subtitles/placeholder", NULL };
 
        /* Remove old UI */
        gtk_ui_manager_remove_ui (totem->ui_manager, totem->subtitles_ui_id);
diff --git a/src/totem-object.c b/src/totem-object.c
index 3b52b6f..d3b4706 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -1184,18 +1184,6 @@ totem_object_action_exit (TotemObject *totem)
        exit (0);
 }
 
-static void
-totem_action_menu_popup (TotemObject *totem, guint button)
-{
-       GtkWidget *menu;
-
-       menu = gtk_ui_manager_get_widget (totem->ui_manager,
-                       "/totem-main-popup");
-       gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                       button, gtk_get_current_event_time ());
-       gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
-}
-
 G_GNUC_NORETURN gboolean
 main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, TotemObject *totem)
 {
@@ -3176,9 +3164,6 @@ on_video_button_press_event (BaconVideoWidget *bvw, GdkEventButton *event,
                //totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
                totem_object_action_play_pause (totem);
                return TRUE;
-       } else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
-               totem_action_menu_popup (totem, event->button);
-               return TRUE;
        }
 
        return FALSE;
@@ -3433,13 +3418,15 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
                break;
        case GDK_KEY_Menu:
        case GDK_KEY_Time:
-               totem_action_menu_popup (totem, 0);
+               /* FIXME find replacement
+               totem_action_menu_popup (totem, 0); */
                break;
        case GDK_KEY_F10:
                if (!(event->state & GDK_SHIFT_MASK))
                        return FALSE;
 
-               totem_action_menu_popup (totem, 0);
+               /* FIXME find replacement
+               totem_action_menu_popup (totem, 0); */
                break;
        case GDK_KEY_equal:
                if (event->state & GDK_CONTROL_MASK)