epiphany r8113 - trunk/src

[diegoe svn gnome org]

Author: diegoe
Date: Sun Mar 16 20:57:04 2008
New Revision: 8113
URL: http://svn.gnome.org/viewvc/epiphany?rev=8113&view=rev

Log:
Revert the history/bookmark no-dup patch. It was slowing ephy.



Modified:
   trunk/src/ephy-location-action.c

Modified: trunk/src/ephy-location-action.c
==============================================================================
--- trunk/src/ephy-location-action.c	(original)
+++ trunk/src/ephy-location-action.c	Sun Mar 16 20:57:04 2008
@@ -155,7 +155,6 @@
 	char *keywords = NULL;
 	gboolean ret = FALSE;
 	GtkTreeModel *model;
-	GtkTreeIter iter2;
 	EphyLocationActionPrivate *priv;
 	
 	priv = EPHY_LOCATION_ACTION (data)->priv;
@@ -202,17 +201,6 @@
 		}
 	}
 	
-	gtk_tree_model_sort_convert_iter_to_child_iter 
-		(GTK_TREE_MODEL_SORT (model), &iter2, iter);
-
-	/* This checks if the item's URL exists as a bookmark, if that's true 
-	 * and we are seeing an history item, then we skip showing it.
-	 * The bookmark will be shown instead since we are not filtering it out.
-	 */
-	if (ephy_bookmarks_find_bookmark (priv->bookmarks, url) != NULL &&
-	    (iter2.user_data2 == priv->history))
-		ret = FALSE;
-
 	g_free (item);
 	g_free (url);
 	g_free (keywords);