From 156e4360507fbc39e6caef7058e700802a721e2b Mon Sep 17 00:00:00 2001
From: Diego Escalante Urrelo <descalante@igalia.com>
Date: Mon, 11 Jan 2010 23:13:19 -0500
Subject: Remove legacy ALLOW_FIXUP flags

This were used by the gecko backend and nowadays are not used at all.

Bug #608749
---
 src/ephy-home-action.c     | 8 ++++----
 src/ephy-link.h            | 1 -
 src/ephy-location-action.c | 4 ++--
 src/ephy-shell.h           | 3 +--
 src/ephy-window.c          | 4 ----
 src/window-commands.c      | 2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/ephy-home-action.c b/src/ephy-home-action.c
index 7dc7cf8f2..c2826a3bf 100644
--- a/src/ephy-home-action.c
+++ b/src/ephy-home-action.c
@@ -121,13 +121,13 @@ action_name_association (GtkAction *action,
 		{
 			ephy_link_open (EPHY_LINK (action),
 					address, NULL,
-					EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO | EPHY_LINK_ALLOW_FIXUP);
+					EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO);
 		}
 		else
 		{
 			ephy_home_action_open (action, 
 					       address, 
-					       EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO | EPHY_LINK_ALLOW_FIXUP);
+					       EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO);
 		}
 	}
 	else if (strcmp (action_name, "FileNewWindow") == 0)
@@ -136,13 +136,13 @@ action_name_association (GtkAction *action,
 		{
 			ephy_link_open (EPHY_LINK (action),
 					address, NULL,
-					EPHY_LINK_NEW_WINDOW | EPHY_LINK_ALLOW_FIXUP);
+					EPHY_LINK_NEW_WINDOW);
 		}
 		else
 		{
 			ephy_home_action_open (action,
 					       address,
-					       EPHY_LINK_NEW_WINDOW | EPHY_LINK_ALLOW_FIXUP);
+					       EPHY_LINK_NEW_WINDOW);
 		}
 	}
 	else if (strcmp (action_name, "GoHome") == 0)
diff --git a/src/ephy-link.h b/src/ephy-link.h
index fb01ed6bb..5d1a7f8c8 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -46,7 +46,6 @@ typedef enum
 	EPHY_LINK_NEW_WINDOW	= 1 << 0,
 	EPHY_LINK_NEW_TAB	= 1 << 1,
 	EPHY_LINK_JUMP_TO	= 1 << 2,
-	EPHY_LINK_ALLOW_FIXUP	= 1 << 3
 } EphyLinkFlags;
 
 struct _EphyLinkIface
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 7cc22e619..38bcb1d89 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -174,7 +174,7 @@ action_activated_cb (GtkEntryCompletion *completion,
 		if (url == NULL) return;
 
 		ephy_link_open (EPHY_LINK (action), url, NULL,
-				ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
+				ephy_link_flags_from_current_event ());
 
 		g_free (url);
 	}
@@ -208,7 +208,7 @@ entry_activate_cb (GtkEntry *entry,
 	g_return_if_fail (address != NULL);
 
 	ephy_link_open (EPHY_LINK (action), g_strstrip (address), NULL, 
-			ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
+			ephy_link_flags_from_current_event ());
 
 	g_free (address);
 }
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 1ebb39190..c87a43bdd 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -68,8 +68,7 @@ typedef enum
 	EPHY_NEW_TAB_IN_EXISTING_WINDOW	= 1 << 11,
 
 	/* The way to load */
-	EPHY_NEW_TAB_ALLOW_FIXUP	= 1 << 12,
-	EPHY_NEW_TAB_FROM_EXTERNAL      = 1 << 13,
+	EPHY_NEW_TAB_FROM_EXTERNAL      = 1 << 12,
 	
 } EphyNewTabFlags;
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d3bd6e1b3..a68d4eacc 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3504,10 +3504,6 @@ ephy_window_open_link (EphyLink *link,
 		{
 			ntflags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW;
 		}
-		if (flags & EPHY_LINK_ALLOW_FIXUP)
-		{
-			ntflags |= EPHY_NEW_TAB_ALLOW_FIXUP;
-		}
 
 		new_embed = ephy_shell_new_tab
 				(ephy_shell,
diff --git a/src/window-commands.c b/src/window-commands.c
index 2615d7819..b93c04639 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1182,7 +1182,7 @@ window_cmd_load_location (GtkAction *action,
 
 		ephy_link_open (EPHY_LINK (window), address,
 			        ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)),
-				ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
+				ephy_link_flags_from_current_event ());
 	}
 }
 
-- 
cgit v1.2.3