Part of gtk 2.3 port, changelog too long to paste it

3 files changed, 34 insertions, 42 deletions

diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in
index 00dfac5c3..9d4f99e58 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml.in
+++ b/data/ui/epiphany-bookmark-editor-ui.xml.in
@@ -1,7 +1,7 @@
-<Root>
-<menu>
+<ui>
+<menubar>
 
-<submenu name="FileMenu" verb="File">
+<menu name="FileMenu" verb="File">
  	<menuitem name="FileNewTopic" verb="NewTopic"/>
 	<separator name="FileSep1"/>
         <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
@@ -16,23 +16,21 @@
 	<menuitem name="FileImport" verb="Import"/>
 	<separator name="FileSep5"/>
 	<menuitem name="FileClose" verb="Close"/>
-</submenu>
+</menu>
 
-<submenu name="EditMenu" verb="Edit">
+<menu name="EditMenu" verb="Edit">
 	<menuitem name="EditCut" verb="Cut"/>
 	<menuitem name="EditCopy" verb="Copy"/>
 	<menuitem name="EditPaste" verb="Paste"/>
 	<menuitem name="EditSelectAll" verb="SelectAll"/>
-</submenu>
+</menu>
 
-<submenu name="HelpMenu" verb="Help">
+<menu name="HelpMenu" verb="Help">
 	<menuitem name="HelpContents" verb="HelpContents"/>
 	<menuitem name="HelpAbout" verb="HelpAbout"/>
-</submenu>
-
 </menu>
 
-<popups>
+</menubar>
 
 <popup name="EphyBookmarkEditorPopup" verb="FakeToplevel">
 	<menuitem name="OpenInWindowBMK" verb="OpenInWindow"/>
@@ -55,5 +53,4 @@
 	<menuitem name="ShowInBookmarksBarTPC" verb="ShowInBookmarksBar"/>
 </popup>
 
-</popups>
-</Root>
+</ui>
diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in
index d716f0bd5..fc184f208 100644
--- a/data/ui/epiphany-history-window-ui.xml.in
+++ b/data/ui/epiphany-history-window-ui.xml.in
@@ -1,7 +1,7 @@
-<Root>
-<menu>
+<ui>
+<menubar>
 
-<submenu name="FileMenu" verb="File">
+<menu name="FileMenu" verb="File">
         <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
 	<menuitem name="FileOpenInTab" verb="OpenInTab"/>
 	<separator name="FileSep1"/>
@@ -9,25 +9,23 @@
 	<menuitem name="FileDelete" verb="Delete"/>
 	<separator name="FileSep2"/>
 	<menuitem name="FileClose" verb="Close"/>
-</submenu>
+</menu>
 
-<submenu name="EditMenu" verb="Edit">
+<menu name="EditMenu" verb="Edit">
 	<menuitem name="EditCut" verb="Cut"/>
 	<menuitem name="EditCopy" verb="Copy"/>
 	<menuitem name="EditPaste" verb="Paste"/>
 	<menuitem name="EditSelectAll" verb="SelectAll"/>
 	<separator name="EditSep1"/>
 	<menuitem name="EditClear" verb="Clear"/>
-</submenu>
+</menu>
 
-<submenu name="HelpMenu" verb="Help">
+<menu name="HelpMenu" verb="Help">
 	<menuitem name="HelpContents" verb="HelpContents"/>
 	<menuitem name="HelpAbout" verb="HelpAbout"/>
-</submenu>
-
 </menu>
 
-<popups>
+</menu>
 
 <popup name="EphyHistoryWindowPopup" verb="FakeToplevel">
 	<menuitem name="OpenInWindowHST" verb="OpenInWindow"/>
@@ -39,5 +37,4 @@
 	<menuitem name="DeleteHST" verb="Delete"/>
 </popup>
 
-</popups>
-</Root>
+</ui>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 1a2c44eaa..e97e0b364 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -1,6 +1,6 @@
 <Root>
-<menu>
-<submenu name="FileMenu" verb="File">  
+<menubar>
+<menu name="FileMenu" verb="File">  
         <menuitem name="FileNewWindowMenu" verb="FileNewWindow"/>
 	<menuitem name="FileNewTabMenu" verb="FileNewTab"/>
 	<menuitem name="FileOpenMenu" verb="FileOpen"/>
@@ -11,9 +11,9 @@
 	<menuitem name="FileSendToMenu" verb="FileSendTo"/>
 	<separator name="FileSep3"/>
 	<menuitem name="FileCloseWindowMenu" verb="FileCloseWindow"/>
-</submenu>
+</menu>
 
-<submenu name="EditMenu" verb="Edit">
+<menu name="EditMenu" verb="Edit">
         <menuitem name="EditCutMenu" verb="EditCut"/>
         <menuitem name="EditCopyMenu" verb="EditCopy"/>
         <menuitem name="EditPasteMenu" verb="EditPaste"/>
@@ -27,9 +27,9 @@
 	<menuitem name="EditPersonalDataMenu" verb="EditPersonalData"/>
 	<menuitem name="EditToolbarMenu" verb="EditToolbar"/>
 	<menuitem name="EditPrefsMenu" verb="EditPrefs"/> 
-</submenu>
+</menu>
 
-<submenu name="ViewMenu" verb="View">
+<menu name="ViewMenu" verb="View">
 	<menuitem name="ViewToolbarMenu" verb="ViewToolbar"/>
 	<menuitem name="ViewBookmarksBarMenu" verb="ViewBookmarksBar"/>
 	<menuitem name="ViewStatusbarMenu" verb="ViewStatusbar"/>
@@ -44,9 +44,9 @@
 	<separator name="ViewSep3"/>
 	<menuitem name="ViewStopMenu" verb="ViewStop"/> 
 	<menuitem name="ViewReloadMenu" verb="ViewReload"/>
-</submenu>
+</menu>
 
-<submenu name="GoMenu" verb="Go">
+<menu name="GoMenu" verb="Go">
 	<menuitem name="GoBackMenu" verb="GoBack"/>
 	<menuitem name="GoForwardMenu" verb="GoForward"/>
 	<menuitem name="GoUpMenu" verb="GoUp"/>
@@ -56,15 +56,15 @@
 	<separator name="GoSep2"/>
 	<menuitem name="GoLocationMenu" verb="GoLocation"/>
 	<placeholder name="GoFavorites"/>
-</submenu>
+</menu>
 
-<submenu name="BookmarksMenu" verb="Bookmarks">
+<menu name="BookmarksMenu" verb="Bookmarks">
 	<menuitem name="BookmarksAddBookmarkMenu" verb="FileBookmarkPage"/>
 	<menuitem name="BookmarksEditMenu" verb="GoBookmarks"/>
 	<placeholder name="BookmarksTree"/>
-</submenu>
+</menu>
 
-<submenu name="TabsMenu" verb="Tabs">
+<menu name="TabsMenu" verb="Tabs">
 	<menuitem name="TabsPreviousMenu" verb="TabsPrevious"/>
 	<menuitem name="TabsNextMenu" verb="TabsNext"/>
 	<separator name="TabsSep1"/>
@@ -74,15 +74,14 @@
 	<placeholder name="TabsOpen">
 	<separator name="TabsSep2"/>
 	</placeholder>
-</submenu>
+</menu>
 
-<submenu name="HelpMenu" verb="Help">
+<menu name="HelpMenu" verb="Help">
 	<menuitem name="HelpContentsMenu" verb="HelpContents"/>
 	<menuitem name="HelpAboutMenu" verb="HelpAbout"/>
-</submenu>
 </menu>
+</menubar>
 
-<popups>
 <popup name="EphyInputPopup" verb="FakeToplevel">
 	<menuitem name="EditCutIP" verb="EditCut"/> 
 	<menuitem name="EditCopyIP" verb="EditCopy"/>
@@ -157,5 +156,4 @@
 	<menuitem name="CopyImageLocationILP" verb="CopyImageLocation"/>
 </popup>
 
-</popups>
-</Root>
+</ui>