*** empty log message ***

8 files changed, 185 insertions, 173 deletions

diff --git a/ChangeLog b/ChangeLog
index ca37b8293..a6c673a01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-08-31  Marco Pesenti Gritti  <marco@gnome.org>
 
+	* src/ephy-window.c: (add_widget), (update_chromes_visibility),
+	(setup_window), (show_embed_popup):
+	* src/toolbar.c: (toolbar_setup_actions):
+
+	Get it running !
+
+2003-08-31  Marco Pesenti Gritti  <marco@gnome.org>
+
 	* data/ui/epiphany-bookmark-editor-ui.xml.in:
 	* data/ui/epiphany-history-window-ui.xml.in:
 	* data/ui/epiphany-ui.xml.in:
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in
index 9d4f99e58..449229660 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml.in
+++ b/data/ui/epiphany-bookmark-editor-ui.xml.in
@@ -1,56 +1,56 @@
 <ui>
 <menubar>
 
-<menu name="FileMenu" verb="File">
- 	<menuitem name="FileNewTopic" verb="NewTopic"/>
+<menu name="FileMenu" action="File">
+ 	<menuitem name="FileNewTopic" action="NewTopic"/>
 	<separator name="FileSep1"/>
-        <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
-	<menuitem name="FileOpenInTab" verb="OpenInTab"/>
+        <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
+	<menuitem name="FileOpenInTab" action="OpenInTab"/>
 	<separator name="FileSep2"/>
-	<menuitem name="FileRename" verb="Rename"/>
-	<menuitem name="FileDelete" verb="Delete"/>
+	<menuitem name="FileRename" action="Rename"/>
+	<menuitem name="FileDelete" action="Delete"/>
 	<separator name="FileSep3"/>
-	<menuitem name="FileShowInBookmarksBar" verb="ShowInBookmarksBar"/>
-	<menuitem name="FileProperties" verb="Properties"/>
+	<menuitem name="FileShowInBookmarksBar" action="ShowInBookmarksBar"/>
+	<menuitem name="FileProperties" action="Properties"/>
 	<separator name="FileSep4"/>
-	<menuitem name="FileImport" verb="Import"/>
+	<menuitem name="FileImport" action="Import"/>
 	<separator name="FileSep5"/>
-	<menuitem name="FileClose" verb="Close"/>
+	<menuitem name="FileClose" action="Close"/>
 </menu>
 
-<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"/>
+<menu name="EditMenu" action="Edit">
+	<menuitem name="EditCut" action="Cut"/>
+	<menuitem name="EditCopy" action="Copy"/>
+	<menuitem name="EditPaste" action="Paste"/>
+	<menuitem name="EditSelectAll" action="SelectAll"/>
 </menu>
 
-<menu name="HelpMenu" verb="Help">
-	<menuitem name="HelpContents" verb="HelpContents"/>
-	<menuitem name="HelpAbout" verb="HelpAbout"/>
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContents" action="HelpContents"/>
+	<menuitem name="HelpAbout" action="HelpAbout"/>
 </menu>
 
 </menubar>
 
-<popup name="EphyBookmarkEditorPopup" verb="FakeToplevel">
-	<menuitem name="OpenInWindowBMK" verb="OpenInWindow"/>
-	<menuitem name="OpenInTabBMK" verb="OpenInTab"/>
+<popup name="EphyBookmarkEditorPopup" action="PopupAction">
+	<menuitem name="OpenInWindowBMK" action="OpenInWindow"/>
+	<menuitem name="OpenInTabBMK" action="OpenInTab"/>
 	<separator name="BookmarksPopupSep1"/>
-	<menuitem name="CopyBMK" verb="Copy"/>
+	<menuitem name="CopyBMK" action="Copy"/>
 	<separator name="BookmarksPopupSep2"/>
-	<menuitem name="RenameBMK" verb="Rename"/>
-	<menuitem name="DeleteBMK" verb="Delete"/>
+	<menuitem name="RenameBMK" action="Rename"/>
+	<menuitem name="DeleteBMK" action="Delete"/>
 	<separator name="BookmarksPopupSep3"/>
-	<menuitem name="ShowInBookmarksBarBMK" verb="ShowInBookmarksBar"/>
+	<menuitem name="ShowInBookmarksBarBMK" action="ShowInBookmarksBar"/>
 	<separator name="BookmarksPopupSep4"/>
-	<menuitem name="BMKProperties" verb="Properties"/>
+	<menuitem name="BMKProperties" action="Properties"/>
 </popup>
 
-<popup name="EphyBookmarkKeywordPopup" verb="FakeToplevel">
-	<menuitem name="RenameTPC" verb="Rename"/>
-	<menuitem name="DeleteTPC" verb="Delete"/>
+<popup name="EphyBookmarkKeywordPopup" action="PopupAction">
+	<menuitem name="RenameTPC" action="Rename"/>
+	<menuitem name="DeleteTPC" action="Delete"/>
 	<separator name="TopicPopupSep3"/>
-	<menuitem name="ShowInBookmarksBarTPC" verb="ShowInBookmarksBar"/>
+	<menuitem name="ShowInBookmarksBarTPC" action="ShowInBookmarksBar"/>
 </popup>
 
 </ui>
diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in
index fc184f208..8344e1d2e 100644
--- a/data/ui/epiphany-history-window-ui.xml.in
+++ b/data/ui/epiphany-history-window-ui.xml.in
@@ -1,40 +1,40 @@
 <ui>
 <menubar>
 
-<menu name="FileMenu" verb="File">
-        <menuitem name="FileOpenInWindow" verb="OpenInWindow"/>
-	<menuitem name="FileOpenInTab" verb="OpenInTab"/>
+<menu name="FileMenu" action="File">
+        <menuitem name="FileOpenInWindow" action="OpenInWindow"/>
+	<menuitem name="FileOpenInTab" action="OpenInTab"/>
 	<separator name="FileSep1"/>
-	<menuitem name="FileBookmarkLink" verb="BookmarkLink"/>
-	<menuitem name="FileDelete" verb="Delete"/>
+	<menuitem name="FileBookmarkLink" action="BookmarkLink"/>
+	<menuitem name="FileDelete" action="Delete"/>
 	<separator name="FileSep2"/>
-	<menuitem name="FileClose" verb="Close"/>
+	<menuitem name="FileClose" action="Close"/>
 </menu>
 
-<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"/>
+<menu name="EditMenu" action="Edit">
+	<menuitem name="EditCut" action="Cut"/>
+	<menuitem name="EditCopy" action="Copy"/>
+	<menuitem name="EditPaste" action="Paste"/>
+	<menuitem name="EditSelectAll" action="SelectAll"/>
 	<separator name="EditSep1"/>
-	<menuitem name="EditClear" verb="Clear"/>
+	<menuitem name="EditClear" action="Clear"/>
 </menu>
 
-<menu name="HelpMenu" verb="Help">
-	<menuitem name="HelpContents" verb="HelpContents"/>
-	<menuitem name="HelpAbout" verb="HelpAbout"/>
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContents" action="HelpContents"/>
+	<menuitem name="HelpAbout" action="HelpAbout"/>
 </menu>
 
 </menu>
 
-<popup name="EphyHistoryWindowPopup" verb="FakeToplevel">
-	<menuitem name="OpenInWindowHST" verb="OpenInWindow"/>
-	<menuitem name="OpenInTabHST" verb="OpenInTab"/>
+<popup name="EphyHistoryWindowPopup" action="PopupMenu">
+	<menuitem name="OpenInWindowHST" action="OpenInWindow"/>
+	<menuitem name="OpenInTabHST" action="OpenInTab"/>
 	<separator name="HistoryPopupSep1"/>
-	<menuitem name="CopyHST" verb="Copy"/>
+	<menuitem name="CopyHST" action="Copy"/>
 	<separator name="HistoryPopupSep2"/>
-	<menuitem name="BookmarkLinkHST" verb="BookmarkLink"/>
-	<menuitem name="DeleteHST" verb="Delete"/>
+	<menuitem name="BookmarkLinkHST" action="BookmarkLink"/>
+	<menuitem name="DeleteHST" action="Delete"/>
 </popup>
 
 </ui>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index e97e0b364..6193a299d 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -1,159 +1,159 @@
-<Root>
+<ui>
 <menubar>
-<menu name="FileMenu" verb="File">  
-        <menuitem name="FileNewWindowMenu" verb="FileNewWindow"/>
-	<menuitem name="FileNewTabMenu" verb="FileNewTab"/>
-	<menuitem name="FileOpenMenu" verb="FileOpen"/>
+<menu name="FileMenu" action="File">  
+        <menuitem name="FileNewWindowMenu" action="FileNewWindow"/>
+	<menuitem name="FileNewTabMenu" action="FileNewTab"/>
+	<menuitem name="FileOpenMenu" action="FileOpen"/>
 	<separator name="FileSep1"/>	
-        <menuitem name="FileSaveAsMenu" verb="FileSaveAs"/>
+        <menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
 	<separator name="FileSep2"/>
-	<menuitem name="FilePrintMenu" verb="FilePrint"/>
-	<menuitem name="FileSendToMenu" verb="FileSendTo"/>
+	<menuitem name="FilePrintMenu" action="FilePrint"/>
+	<menuitem name="FileSendToMenu" action="FileSendTo"/>
 	<separator name="FileSep3"/>
-	<menuitem name="FileCloseWindowMenu" verb="FileCloseWindow"/>
+	<menuitem name="FileCloseWindowMenu" action="FileCloseWindow"/>
 </menu>
 
-<menu name="EditMenu" verb="Edit">
-        <menuitem name="EditCutMenu" verb="EditCut"/>
-        <menuitem name="EditCopyMenu" verb="EditCopy"/>
-        <menuitem name="EditPasteMenu" verb="EditPaste"/>
+<menu name="EditMenu" action="Edit">
+        <menuitem name="EditCutMenu" action="EditCut"/>
+        <menuitem name="EditCopyMenu" action="EditCopy"/>
+        <menuitem name="EditPasteMenu" action="EditPaste"/>
 	<separator name="EditSep1"/> 
-        <menuitem name="EditSelectAllMenu" verb="EditSelectAll"/>
+        <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
 	<separator name="EditSep2"/>
-	<menuitem name="EditFindMenu" verb="EditFind"/>
-	<menuitem name="EditFindNextMenu" verb="EditFindNext"/> 
-	<menuitem name="EditFindPrevMenu" verb="EditFindPrev"/>
+	<menuitem name="EditFindMenu" action="EditFind"/>
+	<menuitem name="EditFindNextMenu" action="EditFindNext"/> 
+	<menuitem name="EditFindPrevMenu" action="EditFindPrev"/>
 	<separator name="EditSep3"/>
-	<menuitem name="EditPersonalDataMenu" verb="EditPersonalData"/>
-	<menuitem name="EditToolbarMenu" verb="EditToolbar"/>
-	<menuitem name="EditPrefsMenu" verb="EditPrefs"/> 
+	<menuitem name="EditPersonalDataMenu" action="EditPersonalData"/>
+	<menuitem name="EditToolbarMenu" action="EditToolbar"/>
+	<menuitem name="EditPrefsMenu" action="EditPrefs"/> 
 </menu>
 
-<menu name="ViewMenu" verb="View">
-	<menuitem name="ViewToolbarMenu" verb="ViewToolbar"/>
-	<menuitem name="ViewBookmarksBarMenu" verb="ViewBookmarksBar"/>
-	<menuitem name="ViewStatusbarMenu" verb="ViewStatusbar"/>
-	<menuitem name="ViewFullscreenMenu" verb="ViewFullscreen"/>
+<menu name="ViewMenu" action="View">
+	<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
+	<menuitem name="ViewBookmarksBarMenu" action="ViewBookmarksBar"/>
+	<menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
+	<menuitem name="ViewFullscreenMenu" action="ViewFullscreen"/>
 	<separator name="ViewSep1"/>
-	<menuitem name="ViewZoomInMenu" verb="ViewZoomIn"/>
-	<menuitem name="ViewZoomOutMenu" verb="ViewZoomOut"/>
-	<menuitem name="ViewZoomNormalMenu" verb="ViewZoomNormal"/>
+	<menuitem name="ViewZoomInMenu" action="ViewZoomIn"/>
+	<menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/>
+	<menuitem name="ViewZoomNormalMenu" action="ViewZoomNormal"/>
 	<separator name="ViewSep2"/>
 	<placeholder name="ViewEncodingsPlaceholder"/>
-	<menuitem name="ViewPageSourceMenu" verb="ViewPageSource"/>
+	<menuitem name="ViewPageSourceMenu" action="ViewPageSource"/>
 	<separator name="ViewSep3"/>
-	<menuitem name="ViewStopMenu" verb="ViewStop"/> 
-	<menuitem name="ViewReloadMenu" verb="ViewReload"/>
+	<menuitem name="ViewStopMenu" action="ViewStop"/> 
+	<menuitem name="ViewReloadMenu" action="ViewReload"/>
 </menu>
 
-<menu name="GoMenu" verb="Go">
-	<menuitem name="GoBackMenu" verb="GoBack"/>
-	<menuitem name="GoForwardMenu" verb="GoForward"/>
-	<menuitem name="GoUpMenu" verb="GoUp"/>
+<menu name="GoMenu" action="Go">
+	<menuitem name="GoBackMenu" action="GoBack"/>
+	<menuitem name="GoForwardMenu" action="GoForward"/>
+	<menuitem name="GoUpMenu" action="GoUp"/>
 	<separator name="GoSep1"/>
-	<menuitem name="GoHomeMenu" verb="GoHome"/>	
-	<menuitem name="GoHistoryMenu" verb="GoHistory"/>
+	<menuitem name="GoHomeMenu" action="GoHome"/>	
+	<menuitem name="GoHistoryMenu" action="GoHistory"/>
 	<separator name="GoSep2"/>
-	<menuitem name="GoLocationMenu" verb="GoLocation"/>
+	<menuitem name="GoLocationMenu" action="GoLocation"/>
 	<placeholder name="GoFavorites"/>
 </menu>
 
-<menu name="BookmarksMenu" verb="Bookmarks">
-	<menuitem name="BookmarksAddBookmarkMenu" verb="FileBookmarkPage"/>
-	<menuitem name="BookmarksEditMenu" verb="GoBookmarks"/>
+<menu name="BookmarksMenu" action="Bookmarks">
+	<menuitem name="BookmarksAddBookmarkMenu" action="FileBookmarkPage"/>
+	<menuitem name="BookmarksEditMenu" action="GoBookmarks"/>
 	<placeholder name="BookmarksTree"/>
 </menu>
 
-<menu name="TabsMenu" verb="Tabs">
-	<menuitem name="TabsPreviousMenu" verb="TabsPrevious"/>
-	<menuitem name="TabsNextMenu" verb="TabsNext"/>
+<menu name="TabsMenu" action="Tabs">
+	<menuitem name="TabsPreviousMenu" action="TabsPrevious"/>
+	<menuitem name="TabsNextMenu" action="TabsNext"/>
 	<separator name="TabsSep1"/>
-	<menuitem name="TabsMoveLeftMenu" verb="TabsMoveLeft"/>
-	<menuitem name="TabsMoveRightMenu" verb="TabsMoveRight"/>
-        <menuitem name="TabsDetachMenu" verb="TabsDetach"/>
+	<menuitem name="TabsMoveLeftMenu" action="TabsMoveLeft"/>
+	<menuitem name="TabsMoveRightMenu" action="TabsMoveRight"/>
+        <menuitem name="TabsDetachMenu" action="TabsDetach"/>
 	<placeholder name="TabsOpen">
 	<separator name="TabsSep2"/>
 	</placeholder>
 </menu>
 
-<menu name="HelpMenu" verb="Help">
-	<menuitem name="HelpContentsMenu" verb="HelpContents"/>
-	<menuitem name="HelpAboutMenu" verb="HelpAbout"/>
+<menu name="HelpMenu" action="Help">
+	<menuitem name="HelpContentsMenu" action="HelpContents"/>
+	<menuitem name="HelpAboutMenu" action="HelpAbout"/>
 </menu>
 </menubar>
 
-<popup name="EphyInputPopup" verb="FakeToplevel">
-	<menuitem name="EditCutIP" verb="EditCut"/> 
-	<menuitem name="EditCopyIP" verb="EditCopy"/>
-	<menuitem name="EditPasteIP" verb="EditPaste"/>
+<popup name="EphyInputPopup" action="PopupMenu">
+	<menuitem name="EditCutIP" action="EditCut"/> 
+	<menuitem name="EditCopyIP" action="EditCopy"/>
+	<menuitem name="EditPasteIP" action="EditPaste"/>
 </popup>
-<popup name="EphyTextPopup" verb="FakeToplevel">
-	<menuitem name="EditCopyTP" verb="EditCopy"/>
+<popup name="EphyTextPopup" action="PopupMenu">
+	<menuitem name="EditCopyTP" action="EditCopy"/>
 </popup>
-<popup name="EphyDocumentPopup" verb="FakeToplevel">
-	<menuitem name="GoBackDP" verb="GoBack"/>
-	<menuitem name="GoForwardDP" verb="GoForward"/>
-	<menuitem name="GoReloadDP" verb="ViewReload"/>
+<popup name="EphyDocumentPopup" action="PopupMenu">
+	<menuitem name="GoBackDP" action="GoBack"/>
+	<menuitem name="GoForwardDP" action="GoForward"/>
+	<menuitem name="GoReloadDP" action="ViewReload"/>
 	<separator name="DPSep1"/>
-	<menuitem name="EditCopyDP" verb="EditCopy"/>
+	<menuitem name="EditCopyDP" action="EditCopy"/>
 	<separator name="DPSep2"/>
-	<menuitem name="SavePageAsDP" verb="FileSaveAs"/>
-	<menuitem name="SaveBackgroundAsDP" verb="SaveBackgroundAs"/>
-	<menuitem name="BookmarkPageDP" verb="ContextBookmarkPage"/>
+	<menuitem name="SavePageAsDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/>
 </popup>
 
-<popup name="EphyFramedDocumentPopup" verb="FakeToplevel">
-	<menuitem name="GoBackFDP" verb="GoBack"/>
-	<menuitem name="GoForwardFDP" verb="GoForward"/>
-	<menuitem name="GoReloadFDP" verb="ViewReload"/>
+<popup name="EphyFramedDocumentPopup" action="PopupMenu">
+	<menuitem name="GoBackFDP" action="GoBack"/>
+	<menuitem name="GoForwardFDP" action="GoForward"/>
+	<menuitem name="GoReloadFDP" action="ViewReload"/>
 	<separator name="FDPSep1"/>
-	<menuitem name="EditCopyFDP" verb="EditCopy"/>
+	<menuitem name="EditCopyFDP" action="EditCopy"/>
 	<separator name="FDPSep2"/>
-	<menuitem name="SavePageAsFDP" verb="FileSaveAs"/>
-	<menuitem name="SaveBackgroundAsFDP" verb="SaveBackgroundAs"/>
-	<menuitem name="BookmarkPageFDP" verb="ContextBookmarkPage"/>
+	<menuitem name="SavePageAsFDP" action="FileSaveAs"/>
+	<menuitem name="SaveBackgroundAsFDP" action="SaveBackgroundAs"/>
+	<menuitem name="BookmarkPageFDP" action="ContextBookmarkPage"/>
 	<separator name="FDBSep3"/>
-	<menuitem name="OpenFrameFDP" verb="OpenFrame"/>
-	<menuitem name="OpenFrameInNewWindowFDP" verb="OpenFrameInNewWindow"/>
-	<menuitem name="OpenFrameInNewTabFDP" verb="OpenFrameInNewTab"/>
+	<menuitem name="OpenFrameFDP" action="OpenFrame"/>
+	<menuitem name="OpenFrameInNewWindowFDP" action="OpenFrameInNewWindow"/>
+	<menuitem name="OpenFrameInNewTabFDP" action="OpenFrameInNewTab"/>
 </popup>
 
-<popup name="EphyLinkPopup" verb="FakeToplevel">
-	<menuitem name="OpenLinkLP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewWindowLP" verb="OpenLinkInNewWindow"/>
-	<menuitem name="OpenLinkInNewTabLP" verb="OpenLinkInNewTab"/>
+<popup name="EphyLinkPopup" action="PopupMenu">
+	<menuitem name="OpenLinkLP" action="OpenLink"/>
+        <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>
+	<menuitem name="OpenLinkInNewTabLP" action="OpenLinkInNewTab"/>
 	<separator name="LPSep1"/>
-	<menuitem name="DownloadLinkLP" verb="DownloadLink"/>
-	<menuitem name="BookmarkLinkLP" verb="BookmarkLink"/>
-	<menuitem name="CopyLinkAddressLP" verb="CopyLinkAddress"/>
+	<menuitem name="DownloadLinkLP" action="DownloadLink"/>
+	<menuitem name="BookmarkLinkLP" action="BookmarkLink"/>
+	<menuitem name="CopyLinkAddressLP" action="CopyLinkAddress"/>
 </popup>
 
-<popup name="EphyImagePopup" verb="FakeToplevel">
-	<menuitem name="OpenImageIP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewWindowIP" verb="OpenImageInNewWindow"/>
-	<menuitem name="OpenImageInNewTabIP" verb="OpenImageInNewTab"/>
+<popup name="EphyImagePopup" action="PopupMenu">
+	<menuitem name="OpenImageIP" action="OpenImage"/>
+	<menuitem name="OpenImageInNewWindowIP" action="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewTabIP" action="OpenImageInNewTab"/>
 	<separator name="IPSep1"/>
-	<menuitem name="SaveImageAsIP" verb="SaveImageAs"/>
-	<menuitem name="SetImageAsBackgroundIP" verb="SetImageAsBackground"/>
-	<menuitem name="CopyImageLocationIP" verb="CopyImageLocation"/>
+	<menuitem name="SaveImageAsIP" action="SaveImageAs"/>
+	<menuitem name="SetImageAsBackgroundIP" action="SetImageAsBackground"/>
+	<menuitem name="CopyImageLocationIP" action="CopyImageLocation"/>
 </popup>
 
-<popup name="EphyImageLinkPopup" verb="FakeToplevel">
-	<menuitem name="OpenLinkILP" verb="OpenLink"/>
-        <menuitem name="OpenLinkInNewWindowILP" verb="OpenLinkInNewWindow"/>
-	<menuitem name="OpenLinkInNewTabILP" verb="OpenLinkInNewTab"/>
+<popup name="EphyImageLinkPopup" action="PopupMenu">
+	<menuitem name="OpenLinkILP" action="OpenLink"/>
+        <menuitem name="OpenLinkInNewWindowILP" action="OpenLinkInNewWindow"/>
+	<menuitem name="OpenLinkInNewTabILP" action="OpenLinkInNewTab"/>
 	<separator name="ILPSep1"/>
-	<menuitem name="DownloadLinkILP" verb="DownloadLink"/>
-	<menuitem name="BookmarkLinkILP" verb="BookmarkLink"/>
-	<menuitem name="CopyLinkAddressILP" verb="CopyLinkAddress"/>
+	<menuitem name="DownloadLinkILP" action="DownloadLink"/>
+	<menuitem name="BookmarkLinkILP" action="BookmarkLink"/>
+	<menuitem name="CopyLinkAddressILP" action="CopyLinkAddress"/>
 	<separator name="ILPSep2"/>
-	<menuitem name="OpenImageILP" verb="OpenImage"/>
-	<menuitem name="OpenImageInNewWindowILP" verb="OpenImageInNewWindow"/>
-	<menuitem name="OpenImageInNewTabILP" verb="OpenImageInNewTab"/>
+	<menuitem name="OpenImageILP" action="OpenImage"/>
+	<menuitem name="OpenImageInNewWindowILP" action="OpenImageInNewWindow"/>
+	<menuitem name="OpenImageInNewTabILP" action="OpenImageInNewTab"/>
 	<separator name="ILPSep3"/>
-	<menuitem name="SaveImageAsILP" verb="SaveImageAs"/>
-	<menuitem name="SetImageAsBackgroundILP" verb="SetImageAsBackground"/>
-	<menuitem name="CopyImageLocationILP" verb="CopyImageLocation"/>
+	<menuitem name="SaveImageAsILP" action="SaveImageAs"/>
+	<menuitem name="SetImageAsBackgroundILP" action="SetImageAsBackground"/>
+	<menuitem name="CopyImageLocationILP" action="CopyImageLocation"/>
 </popup>
 
 </ui>
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 9ddda53c0..dbd3f0ea4 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -203,8 +203,6 @@ ephy_bookmark_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget
 	char *title;
 	GValue value = { 0, };
 
-	LOG ("Set bookmark action proxy label to %s", action->label)
-                                                                                                                             
 	g_value_init (&value, G_TYPE_STRING);
 	g_object_get_property (G_OBJECT (action), "label", &value);
                                                                                                                              
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index ed69d4e1c..214c1c1a0 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -153,8 +153,6 @@ ephy_topic_action_sync_label (GtkAction *action, GParamSpec *pspec, GtkWidget *p
 
 	label_text = g_value_get_string (&value);
 
-	LOG ("Set bookmark action proxy label to %s", action->label)
-
 	if (GTK_IS_TOOL_ITEM (proxy))
 	{
 		label = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "label"));
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 3db27b60c..241bd01c1 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -69,7 +69,7 @@ static GtkActionEntry ephy_menu_entries [] = {
 	{ "Go", NULL, N_("_Go") },
 	{ "Tabs", NULL, N_("_Tabs") },
 	{ "Help", NULL, N_("_Help") },
-	{ "PopupMenu", NULL, NULL },
+	{ "PopupMenu", NULL, "" },
 
 	/* File menu */
 	{ "FileNewWindow", GTK_STOCK_NEW, N_("_New Window"), "<control>N",
@@ -264,7 +264,6 @@ struct EphyWindowPrivate
 {
 	GtkWidget *main_vbox;
 	GtkWidget *menu_dock;
-	GtkWidget *menubar;
 	GtkWidget *exit_fullscreen_popup;
 	Toolbar *toolbar;
 	GtkWidget *statusbar;
@@ -397,11 +396,6 @@ ephy_window_selection_received_cb (GtkWidget *widget,
 static void
 add_widget (GtkUIManager *merge, GtkWidget *widget, EphyWindow *window)
 {
-	if (GTK_IS_MENU_SHELL (widget))
-	{
-		window->priv->menubar = widget;
-	}
-
 	gtk_box_pack_start (GTK_BOX (window->priv->menu_dock),
 			    widget, FALSE, FALSE, 0);
 }
@@ -440,17 +434,22 @@ exit_fullscreen_button_clicked_cb (GtkWidget *button, EphyWindow *window)
 static void
 update_chromes_visibility (EphyWindow *window, EmbedChromeMask flags)
 {
+	GtkWidget *menubar;
 	gboolean fullscreen;
 
 	fullscreen = window->priv->is_fullscreen;
 
+	menubar = gtk_ui_manager_get_widget
+		(GTK_UI_MANAGER (window->ui_merge), "/menubar");
+	g_assert (menubar != NULL);
+
 	if (!fullscreen && flags & EMBED_CHROME_MENUBARON)
 	{
-		gtk_widget_show (window->priv->menubar);
+		gtk_widget_show (menubar);
 	}
 	else
 	{
-		gtk_widget_hide (window->priv->menubar);
+		gtk_widget_hide (menubar);
 	}
 
 	toolbar_set_visibility (window->priv->toolbar,
@@ -583,6 +582,7 @@ setup_window (EphyWindow *window)
 	GtkActionGroup *action_group;
 	GtkAction *action;
 	GtkUIManager *merge;
+	GError *err = NULL;
 
 	window->priv->main_vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (window->priv->main_vbox);
@@ -615,12 +615,14 @@ setup_window (EphyWindow *window)
 	action = gtk_action_group_get_action (action_group, "GoBookmarks");
 	g_object_set (action, "short_label", _("Bookmarks"), NULL);
 
+/*
 	action = gtk_action_group_get_action (action_group, "EditFind");
 	g_object_set (action, "important", TRUE, NULL);
 	action = gtk_action_group_get_action (action_group, "GoHome");
 	g_object_set (action, "important", TRUE, NULL);
 	action = gtk_action_group_get_action (action_group, "GoBookmarks");
 	g_object_set (action, "important", TRUE, NULL);
+*/
 
 	action_group = gtk_action_group_new ("PopupsActions");
 	gtk_action_group_add_actions (action_group, ephy_popups_entries,
@@ -630,16 +632,22 @@ setup_window (EphyWindow *window)
 
 	window->ui_merge = G_OBJECT (merge);
 	g_signal_connect (merge, "add_widget", G_CALLBACK (add_widget), window);
-	gtk_ui_manager_add_ui_from_file
-		(merge, ephy_file ("epiphany-ui.xml"), NULL);
 	gtk_window_add_accel_group (GTK_WINDOW (window),
 				    gtk_ui_manager_get_accel_group (merge));
 
+	gtk_ui_manager_add_ui_from_file
+		(merge, ephy_file ("epiphany-ui.xml"), &err);
+	if (err != NULL)
+	{
+		g_warning ("Could not merge epiphany-ui.xml: %s", err->message);
+		g_clear_error (&err);
+        }
+
 	window->priv->toolbar = toolbar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->priv->toolbar));
-	gtk_box_pack_start (GTK_BOX (window->priv->menu_dock),
-			    GTK_WIDGET (window->priv->toolbar),
-			    FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (window->priv->menu_dock),
+			  GTK_WIDGET (window->priv->toolbar),
+			  FALSE, FALSE, 0);
 	g_signal_connect (window,
 			  "selection-received",
 			  G_CALLBACK (ephy_window_selection_received_cb),
@@ -1029,7 +1037,7 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
 	g_object_set (action, "sensitive", has_background,
 			      "visible", has_background, NULL);
 
-	path = g_strconcat ("/popups/", popup, NULL);
+	path = g_strconcat ("/", popup, NULL);
 	widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER (window->ui_merge),
 				            path);
 	g_free (path);
diff --git a/src/toolbar.c b/src/toolbar.c
index ad74702e9..5feb68c4a 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -270,7 +270,7 @@ toolbar_setup_actions (Toolbar *t)
 			       "tooltip", _("Go back"),
 			       "window", t->priv->window,
 			       "direction", EPHY_NAVIGATION_DIRECTION_BACK,
-			       "important", TRUE,
+/*			       "important", TRUE,*/
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_go_back), t->priv->window);