r15197 - in /desktop/experimental/epiphany-browser/debian: changelog patches/12_no-collapse-history.patch patches/series

[samm-guest at users.alioth.debian.org]

Author: samm-guest
Date: Sun Mar 16 17:28:54 2008
New Revision: 15197

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15197
Log:
* 12_no-collapse-history.patch: taken from Gnome Bugzilla #520215 to solve
  performance problems with bookmark/history URL completion.

Added:
    desktop/experimental/epiphany-browser/debian/patches/12_no-collapse-history.patch
Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/series

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=15197&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Sun Mar 16 17:28:54 2008
@@ -6,6 +6,8 @@
   * Refresh 02_ac_init.patch, 10_url_double-click.patch, 05_libexecdir.patch,
     09_download_dialog.patch and 99_autoreconf.patch.
   * Disable building epiphany-webkit until libwebkitgtk-dev is updated.
+  * 12_no-collapse-history.patch: taken from Gnome Bugzilla #520215 to solve
+    performance problems with bookmark/history URL completion.
 
  -- Sam Morris <sam at robots.org.uk>  Mon, 25 Feb 2008 22:30:44 +0000
 

Added: desktop/experimental/epiphany-browser/debian/patches/12_no-collapse-history.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/12_no-collapse-history.patch?rev=15197&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/12_no-collapse-history.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/12_no-collapse-history.patch Sun Mar 16 17:28:54 2008
@@ -1,0 +1,19 @@
+Index: epiphany-browser-2.22.0/src/ephy-location-action.c
+===================================================================
+--- epiphany-browser-2.22.0.orig/src/ephy-location-action.c	2008-03-16 17:15:30.000000000 +0000
++++ epiphany-browser-2.22.0/src/ephy-location-action.c	2008-03-16 17:15:34.000000000 +0000
+@@ -205,14 +205,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);

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=15197&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Sun Mar 16 17:28:54 2008
@@ -10,4 +10,5 @@
 09_download_dialog.patch -p0
 10_url_double-click.patch
 11_useragent-weasel.patch
+12_no-collapse-history.patch
 99_autoreconf.patch