From d4adb2139ba3c98379911d36534084a0e7462e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= Date: Mon, 26 Sep 2005 19:22:19 +0000 Subject: Unify background image and image code (contex menu, conext event). Fix bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2005-09-26 Jean-François Rameau * src/ephy-lockdown.c: (update_window): * src/ephy-window.c: (update_popups_tooltips), (show_embed_popup): * src/popup-commands.c: * src/popup-commands.h: * embed/mozilla/EventContext.cpp: (GetEventContext): * data/ui/epiphany-ui.xml: Unify background image and image code (contex menu, conext event). Fix bug 154887. --- src/ephy-lockdown.c | 2 -- src/ephy-window.c | 22 +--------------------- src/popup-commands.c | 8 -------- src/popup-commands.h | 3 --- 4 files changed, 1 insertion(+), 34 deletions(-) (limited to 'src') diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index a2397c9df..1d2a9def7 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -198,8 +198,6 @@ update_window (EphyWindow *window, ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled); action = gtk_action_group_get_action (popups_action_group, "DownloadLinkAs"); ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled); - action = gtk_action_group_get_action (popups_action_group, "SaveBackgroundAs"); - ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled); action = gtk_action_group_get_action (popups_action_group, "SaveImageAs"); ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled); writable = eel_gconf_key_is_writable (CONF_DESKTOP_BG_PICTURE); diff --git a/src/ephy-window.c b/src/ephy-window.c index 5283818fa..acc8db5ac 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -311,8 +311,6 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] = static const GtkActionEntry ephy_popups_entries [] = { /* Document */ - { "SaveBackgroundAs", NULL, N_("_Save Background As..."), NULL, - NULL, G_CALLBACK (popup_cmd_save_background_as) }, { "ContextBookmarkPage", STOCK_ADD_BOOKMARK, N_("Add Boo_kmark..."), "D", N_("Add a bookmark for the current page"), G_CALLBACK (window_cmd_file_bookmark_page) }, @@ -1622,8 +1620,6 @@ static void embed_popup_deactivate_cb (GtkWidget *popup, EphyWindow *window) { - EphyWindowPrivate *priv = window->priv; - LOG ("Deactivating popup menu"); enable_edit_actions_sensitivity (window); @@ -1659,18 +1655,6 @@ update_popups_tooltips (EphyWindow *window, EphyEmbedEvent *event) GtkAction *action; char *tooltip, *name; - if (ephy_embed_event_has_property (event, "background_image")) - { - ephy_embed_event_get_property (event, "background_image", &value); - - action = gtk_action_group_get_action (group, "SaveBackgroundAs"); - name = get_name_from_address_value (value); - tooltip = g_strdup_printf (_("Save background image '%s'"), name); - g_object_set (action, "tooltip", tooltip, NULL); - g_free (name); - g_free (tooltip); - } - context = ephy_embed_event_get_context (event); if (context & EPHY_EMBED_CONTEXT_IMAGE) @@ -1755,7 +1739,7 @@ show_embed_popup (EphyWindow *window, EphyEmbedEventContext context; const char *popup; const GValue *value; - gboolean framed, has_background, can_open_in_new; + gboolean framed, can_open_in_new; GtkWidget *widget; guint button; @@ -1768,7 +1752,6 @@ show_embed_popup (EphyWindow *window, ephy_embed_event_get_property (event, "framed_page", &value); framed = g_value_get_int (value); - has_background = ephy_embed_event_has_property (event, "background_image"); can_open_in_new = ephy_embed_event_has_property (event, "link-has-web-scheme"); context = ephy_embed_event_get_context (event); @@ -1823,9 +1806,6 @@ show_embed_popup (EphyWindow *window, g_return_if_fail (widget != NULL); action_group = window->priv->popups_action_group; - action = gtk_action_group_get_action (action_group, "SaveBackgroundAs"); - ephy_action_change_sensitivity_flags (action, SENS_FLAG_CONTEXT, !has_background); - gtk_action_set_visible (action, has_background); action = gtk_action_group_get_action (action_group, "OpenLinkInNewWindow"); gtk_action_set_sensitive (action, can_open_in_new); diff --git a/src/popup-commands.c b/src/popup-commands.c index bd76c3825..fe688ea7d 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -339,14 +339,6 @@ popup_cmd_copy_image_location (GtkAction *action, popup_cmd_copy_to_clipboard (window, location); } -void -popup_cmd_save_background_as (GtkAction *action, - EphyWindow *window) -{ - save_property_url (action, _("Save Background As"), - window, TRUE, "background_image"); -} - void popup_cmd_open_frame (GtkAction *action, EphyWindow *window) diff --git a/src/popup-commands.h b/src/popup-commands.h index 543967da9..e8d15ecc0 100644 --- a/src/popup-commands.h +++ b/src/popup-commands.h @@ -55,9 +55,6 @@ void popup_cmd_set_image_as_background (GtkAction *action, void popup_cmd_copy_image_location (GtkAction *action, EphyWindow *window); -void popup_cmd_save_background_as (GtkAction *action, - EphyWindow *window); - void popup_cmd_open_frame (GtkAction *action, EphyWindow *window); -- cgit v1.2.3