[epiphany] Remove LoadFlags

[Gustavo Noronha Silva <gns src gnome org>]

commit f1785bf92adafcf633a22152c4eb38dcba1ab319
Author: Gustavo Noronha Silva <gns gnome org>
Date:   Wed Jan 14 22:52:10 2009 -0200

    Remove LoadFlags
    
    They were used, it seems, to decide whether to allow Gecko to "fix"
    the URL. WebKit has no such facility, and we are already doing our own
    handling of URI normalization.
---
 embed/ephy-embed.c          |    4 +---
 embed/ephy-embed.h          |    8 --------
 embed/webkit/webkit-embed.c |    1 -
 src/ephy-shell.c            |   11 -----------
 src/ephy-window.c           |   12 +-----------
 5 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index bb1cc3b..9243075 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -368,7 +368,6 @@ ephy_embed_load_url (EphyEmbed *embed,
  * ephy_embed_load:
  * @embed: an #EphyEmbed
  * @url: an URL
- * @flags: flags modifying load behaviour
  * @previous_embed: the referrer embed or %NULL
  *
  * Loads a new web page in @embed.
@@ -376,11 +375,10 @@ ephy_embed_load_url (EphyEmbed *embed,
 void
 ephy_embed_load (EphyEmbed *embed,
 		 const char *url,
-		 EphyEmbedLoadFlags flags,
 		 EphyEmbed *referring_embed)
 {
 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-	iface->load (embed, url, flags, referring_embed);
+	iface->load (embed, url, referring_embed);
 }
 
 /**
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 3b6e03c..8809bf6 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -66,12 +66,6 @@ typedef enum
 	EPHY_EMBED_CHROME_BOOKMARKSBAR	= 1 << 3
 } EphyEmbedChrome;
 
-typedef enum
-{
-	EPHY_EMBED_LOAD_FLAGS_NONE			= 1 << 0,
-	EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP	= 1 << 1,
-} EphyEmbedLoadFlags;
-
 #define EPHY_EMBED_CHROME_ALL (EPHY_EMBED_CHROME_MENUBAR |	\
 			       EPHY_EMBED_CHROME_TOOLBAR |	\
 			       EPHY_EMBED_CHROME_STATUSBAR |	\
@@ -164,7 +158,6 @@ struct _EphyEmbedIface
 							   const char *url);
 	void		   (* load)			  (EphyEmbed *embed,
 							   const char *url,
-							   EphyEmbedLoadFlags flags,
 							   EphyEmbed *referring_embed);
 	gboolean	   (* can_go_up)		  (EphyEmbed *embed);
 	GSList *	   (* get_go_up_list)		  (EphyEmbed *embed);
@@ -222,7 +215,6 @@ void		  ephy_embed_load_url			(EphyEmbed *embed,
 							 const char *url);
 void		  ephy_embed_load			(EphyEmbed *embed,
 							 const char *url,
-							 EphyEmbedLoadFlags flags,
 							 EphyEmbed *referring_embed);
 
 const char	 *ephy_embed_get_title			(EphyEmbed *embed);
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 27a7205..060b243 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -791,7 +791,6 @@ impl_load_url (EphyEmbed *embed,
 static void
 impl_load (EphyEmbed *embed,
            const char *url,
-           EphyEmbedLoadFlags flags,
            EphyEmbed *preview_embed)
 {
   WebKitEmbed *wembed = WEBKIT_EMBED (embed);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index b033920..1052b59 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -520,19 +520,8 @@ ephy_shell_new_tab_full (EphyShell *shell,
 	}
 	else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
 	{
-		EphyEmbedLoadFlags load_flags = 0;
-
 		g_assert (request != NULL);
 
-		if (flags & EPHY_NEW_TAB_ALLOW_FIXUP)
-		{
-			load_flags = EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
-		}
-		else
-		{
-			load_flags = EPHY_EMBED_LOAD_FLAGS_NONE;
-		}
-
 		ephy_web_view_load_request (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)),
 					    request);
 		is_empty = url_is_empty (webkit_network_request_get_uri (request));
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ca926c4..68b0573 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3599,17 +3599,7 @@ ephy_window_open_link (EphyLink *link,
 	}
 	else
 	{
-		if (flags & EPHY_LINK_ALLOW_FIXUP)
-		{
-			ephy_embed_load (embed, 
-					 address, 
-					 EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP,
-					 NULL);
-		}
-		else
-		{
-			ephy_embed_load_url (embed, address);
-		}
+		ephy_embed_load_url (embed, address);
 
 		if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0)
 		{