diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 4 | ||||
| -rw-r--r-- | src/ephy-window.c | 4 | ||||
| -rw-r--r-- | src/popup-commands.c | 40 | ||||
| -rw-r--r-- | src/popup-commands.h | 6 |
5 files changed, 10 insertions, 54 deletions
@@ -1,5 +1,15 @@ 2004-03-29 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-window.c: + * src/popup-commands.c: + * src/popup-commands.h: + * data/ui/epiphany-ui.xml: + + Remove Open Image in New Tab and New Window from the + context menu. + +2004-03-29 Christian Persch <chpe@cvs.gnome.org> + * configure.in: * data/.cvsignore: * data/GNOME_Epiphany_NautilusView.server.in: diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index a972b25b4..b33009b2e 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -140,8 +140,6 @@ <popup name="EphyImagePopup" action="PopupAction"> <menuitem name="OpenImageIP" action="OpenImage"/> - <menuitem name="OpenImageInNewWindowIP" action="OpenImageInNewWindow"/> - <menuitem name="OpenImageInNewTabIP" action="OpenImageInNewTab"/> <separator name="IPSep1"/> <menuitem name="SaveImageAsIP" action="SaveImageAs"/> <menuitem name="SetImageAsBackgroundIP" action="SetImageAsBackground"/> @@ -159,8 +157,6 @@ <menuitem name="CopyLinkAddressILP" action="CopyLinkAddress"/> <separator name="ILPSep2"/> <menuitem name="OpenImageILP" action="OpenImage"/> - <menuitem name="OpenImageInNewWindowILP" action="OpenImageInNewWindow"/> - <menuitem name="OpenImageInNewTabILP" action="OpenImageInNewTab"/> <separator name="ILPSep3"/> <menuitem name="SaveImageAsILP" action="SaveImageAs"/> <menuitem name="SetImageAsBackgroundILP" action="SetImageAsBackground"/> diff --git a/src/ephy-window.c b/src/ephy-window.c index 151f7a036..967d38236 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -291,10 +291,6 @@ static GtkActionEntry ephy_popups_entries [] = { /* Images */ { "OpenImage", GTK_STOCK_OPEN, N_("Open _Image"), GTK_STOCK_OPEN, NULL, G_CALLBACK (popup_cmd_open_image) }, - { "OpenImageInNewWindow", NULL, N_("Open Image in New _Window"), NULL, - NULL, G_CALLBACK (popup_cmd_image_in_new_window) }, - { "OpenImageInNewTab", NULL, N_("Open Image in New T_ab"), NULL, - NULL, G_CALLBACK (popup_cmd_image_in_new_tab) }, { "SaveImageAs", GTK_STOCK_SAVE_AS, N_("_Save Image As..."), NULL, NULL, G_CALLBACK (popup_cmd_save_image_as) }, { "SetImageAsBackground", NULL, N_("_Use Image As Background"), NULL, diff --git a/src/popup-commands.c b/src/popup-commands.c index 6d90abe7a..bd6ea606b 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -88,46 +88,6 @@ popup_cmd_link_in_new_tab (GtkAction *action, } void -popup_cmd_image_in_new_tab (GtkAction *action, - EphyWindow *window) -{ - EphyEmbedEvent *info; - EphyTab *tab; - const GValue *value; - - tab = ephy_window_get_active_tab (window); - - info = get_event_info (window); - - ephy_embed_event_get_property (info, "image", &value); - - ephy_shell_new_tab (ephy_shell, window, tab, - g_value_get_string (value), - EPHY_NEW_TAB_OPEN_PAGE | - EPHY_NEW_TAB_IN_EXISTING_WINDOW); -} - -void -popup_cmd_image_in_new_window (GtkAction *action, - EphyWindow *window) -{ - EphyEmbedEvent *info; - EphyTab *tab; - const GValue *value; - - tab = ephy_window_get_active_tab (window); - - info = get_event_info (window); - - ephy_embed_event_get_property (info, "image", &value); - - ephy_shell_new_tab (ephy_shell, NULL, tab, - g_value_get_string (value), - EPHY_NEW_TAB_OPEN_PAGE | - EPHY_NEW_TAB_IN_NEW_WINDOW); -} - -void popup_cmd_bookmark_link (GtkAction *action, EphyWindow *window) { diff --git a/src/popup-commands.h b/src/popup-commands.h index b999b28da..d0d6cc719 100644 --- a/src/popup-commands.h +++ b/src/popup-commands.h @@ -28,12 +28,6 @@ void popup_cmd_link_in_new_window (GtkAction *action, void popup_cmd_link_in_new_tab (GtkAction *action, EphyWindow *window); -void popup_cmd_image_in_new_tab (GtkAction *action, - EphyWindow *window); - -void popup_cmd_image_in_new_window (GtkAction *action, - EphyWindow *window); - void popup_cmd_bookmark_link (GtkAction *action, EphyWindow *window); |