From 3d58425833b6950f57fbc7578081f76befd17c14 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Sun, 31 Aug 2003 18:09:43 +0000
Subject: Fix problems with EphyNodeView, bookmarks and history dialogs and
 update

2003-08-31  Marco Pesenti Gritti  <marco@gnome.org>

        * data/ui/epiphany-history-window-ui.xml.in:
        * data/ui/epiphany-ui.xml.in:
        * lib/widgets/ephy-node-view.c: (get_selection):
        * src/bookmarks/ephy-bookmarks-editor.c: (add_widget),
        (ephy_bookmarks_editor_construct):
        * src/bookmarks/ephy-bookmarks-menu.c: (add_bookmarks_menu),
        (ephy_bookmarks_menu_rebuild):
        * src/ephy-encoding-menu.c: (build_group), (build_encoding),
        (ephy_encoding_menu_rebuild):
        * src/ephy-favorites-menu.c: (ephy_favorites_menu_rebuild):
        * src/ephy-history-window.c: (add_widget),
        (ephy_history_window_construct):
        * src/ephy-tabs-menu.c: (ephy_tabs_menu_clean),
        (ephy_tabs_menu_update):
        * src/ephy-window.c: (setup_window), (ephy_window_init):

        Fix problems with EphyNodeView, bookmarks and history
        dialogs and update dynamic menus to the new xml format.
---
 data/ui/epiphany-history-window-ui.xml.in |  4 +++-
 data/ui/epiphany-ui.xml.in                | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in
index 8344e1d2e..3e5c80dd8 100644
--- a/data/ui/epiphany-history-window-ui.xml.in
+++ b/data/ui/epiphany-history-window-ui.xml.in
@@ -27,7 +27,9 @@
 
 </menu>
 
-<popup name="EphyHistoryWindowPopup" action="PopupMenu">
+</menubar>
+
+<popup name="EphyHistoryWindowPopup" action="PopupAction">
 	<menuitem name="OpenInWindowHST" action="OpenInWindow"/>
 	<menuitem name="OpenInTabHST" action="OpenInTab"/>
 	<separator name="HistoryPopupSep1"/>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 6193a299d..9e820d1fe 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -82,15 +82,15 @@
 </menu>
 </menubar>
 
-<popup name="EphyInputPopup" action="PopupMenu">
+<popup name="EphyInputPopup" action="PopupAction">
 	<menuitem name="EditCutIP" action="EditCut"/> 
 	<menuitem name="EditCopyIP" action="EditCopy"/>
 	<menuitem name="EditPasteIP" action="EditPaste"/>
 </popup>
-<popup name="EphyTextPopup" action="PopupMenu">
+<popup name="EphyTextPopup" action="PopupAction">
 	<menuitem name="EditCopyTP" action="EditCopy"/>
 </popup>
-<popup name="EphyDocumentPopup" action="PopupMenu">
+<popup name="EphyDocumentPopup" action="PopupAction">
 	<menuitem name="GoBackDP" action="GoBack"/>
 	<menuitem name="GoForwardDP" action="GoForward"/>
 	<menuitem name="GoReloadDP" action="ViewReload"/>
@@ -102,7 +102,7 @@
 	<menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/>
 </popup>
 
-<popup name="EphyFramedDocumentPopup" action="PopupMenu">
+<popup name="EphyFramedDocumentPopup" action="PopupAction">
 	<menuitem name="GoBackFDP" action="GoBack"/>
 	<menuitem name="GoForwardFDP" action="GoForward"/>
 	<menuitem name="GoReloadFDP" action="ViewReload"/>
@@ -118,7 +118,7 @@
 	<menuitem name="OpenFrameInNewTabFDP" action="OpenFrameInNewTab"/>
 </popup>
 
-<popup name="EphyLinkPopup" action="PopupMenu">
+<popup name="EphyLinkPopup" action="PopupAction">
 	<menuitem name="OpenLinkLP" action="OpenLink"/>
         <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/>
 	<menuitem name="OpenLinkInNewTabLP" action="OpenLinkInNewTab"/>
@@ -128,7 +128,7 @@
 	<menuitem name="CopyLinkAddressLP" action="CopyLinkAddress"/>
 </popup>
 
-<popup name="EphyImagePopup" action="PopupMenu">
+<popup name="EphyImagePopup" action="PopupAction">
 	<menuitem name="OpenImageIP" action="OpenImage"/>
 	<menuitem name="OpenImageInNewWindowIP" action="OpenImageInNewWindow"/>
 	<menuitem name="OpenImageInNewTabIP" action="OpenImageInNewTab"/>
@@ -138,7 +138,7 @@
 	<menuitem name="CopyImageLocationIP" action="CopyImageLocation"/>
 </popup>
 
-<popup name="EphyImageLinkPopup" action="PopupMenu">
+<popup name="EphyImageLinkPopup" action="PopupAction">
 	<menuitem name="OpenLinkILP" action="OpenLink"/>
         <menuitem name="OpenLinkInNewWindowILP" action="OpenLinkInNewWindow"/>
 	<menuitem name="OpenLinkInNewTabILP" action="OpenLinkInNewTab"/>
-- 
cgit v1.2.3