diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 2 | ||||
| -rw-r--r-- | src/popup-commands.c | 44 | ||||
| -rw-r--r-- | src/popup-commands.h | 9 |
4 files changed, 8 insertions, 55 deletions
@@ -1,3 +1,11 @@ +2004-05-13 Christian Persch <chpe@cvs.gnome.org> + + * data/ui/epiphany-ui.xml: + * src/popup-commands.c: + * src/popup-commands.h: + + Simplify context menu wrt. frames. Fixes bug #138442. + 2004-05-12 Christian Persch <chpe@cvs.gnome.org> * src/epiphany.in: diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index 4e1e7f244..6da7f0f16 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -121,8 +121,6 @@ <menuitem name="BookmarkPageFDP" action="ContextBookmarkPage"/> <separator name="FDBSep3"/> <menuitem name="OpenFrameFDP" action="OpenFrame"/> - <menuitem name="OpenFrameInNewWindowFDP" action="OpenFrameInNewWindow"/> - <menuitem name="OpenFrameInNewTabFDP" action="OpenFrameInNewTab"/> </popup> <popup name="EphyLinkPopup" action="PopupAction"> diff --git a/src/popup-commands.c b/src/popup-commands.c index bd6ea606b..0f880dc72 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -145,50 +145,6 @@ popup_cmd_bookmark_link (GtkAction *action, } } -void -popup_cmd_frame_in_new_tab (GtkAction *action, - EphyWindow *window) -{ - EphyTab *tab; - EphyEmbed *embed; - char *location; - - tab = ephy_window_get_active_tab (window); - - embed = ephy_window_get_active_embed (window); - - location = ephy_embed_get_location (embed, FALSE); - - ephy_shell_new_tab (ephy_shell, window, tab, - location, - EPHY_NEW_TAB_OPEN_PAGE | - EPHY_NEW_TAB_IN_EXISTING_WINDOW); - - g_free (location); -} - -void -popup_cmd_frame_in_new_window (GtkAction *action, - EphyWindow *window) -{ - EphyTab *tab; - EphyEmbed *embed; - char *location; - - tab = ephy_window_get_active_tab (window); - - embed = ephy_window_get_active_embed (window); - - location = ephy_embed_get_location (embed, FALSE); - - ephy_shell_new_tab (ephy_shell, NULL, tab, - location, - EPHY_NEW_TAB_OPEN_PAGE | - EPHY_NEW_TAB_IN_NEW_WINDOW); - - g_free (location); -} - static void popup_cmd_copy_to_clipboard (EphyWindow *window, const char *text) { diff --git a/src/popup-commands.h b/src/popup-commands.h index d0d6cc719..543967da9 100644 --- a/src/popup-commands.h +++ b/src/popup-commands.h @@ -31,15 +31,6 @@ void popup_cmd_link_in_new_tab (GtkAction *action, void popup_cmd_bookmark_link (GtkAction *action, EphyWindow *window); -void popup_cmd_frame_in_new_tab (GtkAction *action, - EphyWindow *window); - -void popup_cmd_frame_in_new_window (GtkAction *action, - EphyWindow *window); - -void popup_cmd_add_frame_bookmark (GtkAction *action, - EphyWindow *window); - void popup_cmd_view_source (GtkAction *action, EphyWindow *window); |