[epiphany] Remove the "Open Frame" functionality

[Xan Lopez <xan src gnome org>]

commit f9d3e0df1d982cd511af088ba12384d9fdca8ba8
Author: Xan Lopez <xan igalia com>
Date:   Mon Jan 23 14:38:42 2012 +0100

    Remove the "Open Frame" functionality
    
    It's been #if 0-ed and broken forever too. If someone really wants it
    it should probably go into an extension.

 data/ui/epiphany-ui.xml |    2 --
 src/ephy-window.c       |   22 +++-------------------
 src/popup-commands.c    |   17 -----------------
 src/popup-commands.h    |    3 ---
 4 files changed, 3 insertions(+), 41 deletions(-)
---
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 9f7b9b3..9a4ce99 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -28,8 +28,6 @@
 		<separator />
 		<menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/>
 		<separator />
-		<menuitem name="OpenFrameFDP" action="OpenFrame"/>
-		<separator />
 		<menuitem name="OpenImageDP" action="OpenImage"/>
 		<menuitem name="SaveImageAsDP" action="SaveImageAs"/>
 		<menuitem name="SetImageAsBackgroundDP" action="SetImageAsBackground"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 99106c8..0a48de5 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -238,12 +238,6 @@ static const GtkActionEntry ephy_popups_entries [] = {
 	  N_("Add a bookmark for the current page"),
 	  G_CALLBACK (window_cmd_file_bookmark_page) },
 	
-	/* Framed document. */
-
-	{ "OpenFrame", NULL, N_("Show Only _This Frame"), NULL,
-	  N_("Show only this frame in this window"),
-	  G_CALLBACK (popup_cmd_open_frame) },
-
 	/* Links. */
 
 	{ "OpenLink", GTK_STOCK_JUMP_TO, N_("_Open Link"), NULL,
@@ -1139,8 +1133,7 @@ ephy_window_delete_event (GtkWidget *widget,
 static void
 update_popup_actions_visibility (EphyWindow *window,
 				 WebKitWebView *view,
-				 guint context,
-				 gboolean is_frame)
+				 guint context)
 {
 	GtkAction *action;
 	GtkActionGroup *action_group;
@@ -1173,9 +1166,6 @@ update_popup_actions_visibility (EphyWindow *window,
 	action = gtk_action_group_get_action (action_group, "CopyImageLocation");
 	gtk_action_set_visible (action, is_image);
 
-	action = gtk_action_group_get_action (action_group, "OpenFrame");
-	gtk_action_set_visible (action, is_frame);
-
 	if (is_editable)
 	{
 		char *text = NULL;
@@ -1942,17 +1932,12 @@ show_embed_popup (EphyWindow *window,
 	GtkAction *action;
 	guint context;
 	const char *popup;
-	gboolean framed = FALSE, can_open_in_new;
+	gboolean can_open_in_new;
 	GtkWidget *widget;
 	guint button;
 	char *uri;
 	EphyEmbedEvent *embed_event;
 
-#if 0
-	value = ephy_embed_event_get_property (event, "framed_page");
-	framed = g_value_get_int (value);
-#endif
-
 	g_object_get (hit_test_result, "link-uri", &uri, NULL);
 	can_open_in_new = uri && ephy_embed_utils_address_has_web_scheme (uri);
 	g_free (uri);
@@ -1992,8 +1977,7 @@ show_embed_popup (EphyWindow *window,
 	
 	update_popup_actions_visibility (window,
 					 view,
-					 context,
-					 framed);
+					 context);
 
 	embed_event = ephy_embed_event_new (event, hit_test_result);
 	_ephy_window_set_context_event (window, embed_event);
diff --git a/src/popup-commands.c b/src/popup-commands.c
index bc57f23..5860b46 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -354,23 +354,6 @@ popup_cmd_copy_image_location (GtkAction *action,
 	g_value_unset (&value);
 }
 
-void
-popup_cmd_open_frame (GtkAction *action,
-		      EphyWindow *window)
-{
-	char *location;
-	EphyEmbed *embed;
-
-	embed = ephy_embed_container_get_active_child 
-		(EPHY_EMBED_CONTAINER (window));
-	g_return_if_fail (embed != NULL);
-
-	location = ephy_web_view_get_location (ephy_embed_get_web_view (embed), FALSE);
-	ephy_web_view_load_url (ephy_embed_get_web_view (embed), location);
-
-	g_free (location);
-}
-
 /* Opens an image URI using its associated handler. Or, if that
  * doesn't work, fallback to open the URI in a new browser window.
  */
diff --git a/src/popup-commands.h b/src/popup-commands.h
index f180564..cabecdf 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -54,9 +54,6 @@ void popup_cmd_set_image_as_background  (GtkAction *action,
 void popup_cmd_copy_image_location	(GtkAction *action,
 					 EphyWindow *window);
 
-void popup_cmd_open_frame		(GtkAction *action,
-					 EphyWindow *window);
-
 void popup_cmd_open_image		(GtkAction *action,
 					 EphyWindow *window);