[totem] Move subtitles-related menu items to View → Subtitles

[Philip Withnall <pwithnall src gnome org>]

commit d64c72407e1362836e98edb6245d03830679f9d2
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Jul 19 23:26:37 2009 +0100

    Move subtitles-related menu items to View â?? Subtitles
    
    2009-07-19  Philip Withnall  <philip tecnocode co uk>
    
    	* data/totem.ui:
    	* src/plugins/opensubtitles/opensubtitles.py:
    	* src/totem-menu.c (totem_subtitles_update): Move subtitles-related
    	menu items to View â?? Subtitles. (Closes: #581366)

 ChangeLog                                  |    7 +++++++
 data/totem.ui                              |    5 +++--
 src/plugins/opensubtitles/opensubtitles.py |    2 +-
 src/totem-menu.c                           |    3 +--
 4 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6195a92..901d6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-19  Philip Withnall  <philip tecnocode co uk>
 
+	* data/totem.ui:
+	* src/plugins/opensubtitles/opensubtitles.py:
+	* src/totem-menu.c (totem_subtitles_update): Move subtitles-related
+	menu items to View â?? Subtitles. (Closes: #581366)
+
+2009-07-19  Philip Withnall  <philip tecnocode co uk>
+
 	* data/fullscreen.glade:
 	* data/mozilla-viewer.glade:
 	* data/playlist.glade:
diff --git a/data/totem.ui b/data/totem.ui
index d79c8f4..f894d31 100644
--- a/data/totem.ui
+++ b/data/totem.ui
@@ -468,9 +468,10 @@
             <menuitem name="next-angle" action="next-angle"/>
 	    <menuitem name="show-controls" action="show-controls"/>
             <separator/>
-	    <menuitem name="select-subtitle" action="select-subtitle"/>
-	    <placeholder name="subtitle-download-placeholder"/>
             <menu name="subtitles" action="subtitles-menu">
+               <menuitem name="select-subtitle" action="select-subtitle"/>
+	       <placeholder name="subtitle-download-placeholder"/>
+	       <separator/>
                <placeholder name="placeholder"/>
             </menu>
             <separator/>
diff --git a/src/plugins/opensubtitles/opensubtitles.py b/src/plugins/opensubtitles/opensubtitles.py
index ec0e6d2..3c5c3bc 100644
--- a/src/plugins/opensubtitles/opensubtitles.py
+++ b/src/plugins/opensubtitles/opensubtitles.py
@@ -426,7 +426,7 @@ class OpenSubtitles(totem.Plugin):
 
         self.menu_id = self.manager.new_merge_id()
         self.manager.add_ui(self.menu_id,
-                             '/tmw-menubar/view/subtitle-download-placeholder',
+                             '/tmw-menubar/view/subtitles/subtitle-download-placeholder',
                              'opensubtitles',
                              'opensubtitles',
                              gtk.UI_MANAGER_MENUITEM,
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 1b001cf..bf7bbc1 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -462,8 +462,7 @@ totem_subtitles_update (Totem *totem, GList *list)
 			totem->subtitles_action_group, -1);
 
 
-	if (list != NULL)
-	{
+	if (list != NULL) {
 		action = create_lang_actions (totem, totem->subtitles_action_group,
 				totem->subtitles_ui_id,
 				paths,