diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-tab.c | 7 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 | ||||
| -rw-r--r-- | src/popup-commands.c | 15 | ||||
| -rw-r--r-- | src/window-commands.c | 17 |
4 files changed, 0 insertions, 41 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index be1942629..578fe6a75 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -849,15 +849,12 @@ ephy_tab_show_embed_popup (EphyTab *tab, EphyEmbedEvent *event) EphyWindow *window; char *path; GtkWidget *widget; - gresult can_copy; window = ephy_tab_get_window (tab); ephy_embed_event_get_property (event, "framed_page", &value); framed = g_value_get_int (value); - can_copy = ephy_embed_selection_can_copy (tab->priv->embed); - ephy_embed_event_get_context (event, &context); if ((context & EMBED_CONTEXT_LINK) && @@ -877,10 +874,6 @@ ephy_tab_show_embed_popup (EphyTab *tab, EphyEmbedEvent *event) { popup = "EphyInputPopup"; } - else if (can_copy == G_OK) - { - popup = "EphyTextPopup"; - } else { popup = framed ? "EphyFramedDocumentPopup" : diff --git a/src/ephy-window.c b/src/ephy-window.c index cd6113412..a1d29a28b 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -212,8 +212,6 @@ static EggActionGroupEntry ephy_popups_entries [] = { /* Document */ { "SaveBackgroundAs", N_("_Save Background As..."), NULL, NULL, NULL, G_CALLBACK (popup_cmd_save_background_as), NULL }, - { "CopyPageLocation", N_("_Copy Page Location"), GTK_STOCK_COPY, NULL, - NULL, G_CALLBACK (popup_cmd_copy_page_location), NULL }, /* Framed document */ { "OpenFrame", N_("_Open Frame"), NULL, NULL, diff --git a/src/popup-commands.c b/src/popup-commands.c index 1188f0573..7b5a6ffe0 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -218,21 +218,6 @@ popup_cmd_copy_to_clipboard (EphyWindow *window, const char *text) } void -popup_cmd_copy_page_location (EggAction *action, - EphyWindow *window) -{ - char *location; - EphyEmbed *embed; - - embed = ephy_window_get_active_embed (window); - g_return_if_fail (embed != NULL); - - ephy_embed_get_location (embed, FALSE, &location); - popup_cmd_copy_to_clipboard (window, location); - g_free (location); -} - -void popup_cmd_copy_email (EggAction *action, EphyWindow *window) { diff --git a/src/window-commands.c b/src/window-commands.c index c5ea747a3..8d335fe6d 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -41,23 +41,6 @@ #include <gtk/gtkmessagedialog.h> #include <gtk/gtkeditable.h> -#define AVAILABLE_TOOLBAR_ITEMS \ - "back=navigation_button(direction=back,arrow=FALSE);" \ - "back_menu=navigation_button(direction=back,arrow=TRUE);" \ - "forward=navigation_button(direction=forward,arrow=FALSE);" \ - "forward_menu=navigation_button(direction=forward,arrow=TRUE);" \ - "up=navigation_button(direction=up,arrow=FALSE);" \ - "up_menu=navigation_button(direction=up,arrow=TRUE);" \ - "stop=std_toolitem(item=stop);" \ - "reload=std_toolitem(item=reload);" \ - "home=std_toolitem(item=home);" \ - "favicon=favicon;" \ - "location=location;" \ - "go=std_toolitem(item=go);" \ - "zoom=zoom;" \ - "spinner=spinner;" \ - "separator;" - void window_cmd_edit_find (EggAction *action, EphyWindow *window) |