epiphany r8691 - in branches/gnome-2-26: lib/widgets src

[diegoe svn gnome org]

Author: diegoe
Date: Tue Jan 13 21:55:24 2009
New Revision: 8691
URL: http://svn.gnome.org/viewvc/epiphany?rev=8691&view=rev

Log:
Real fix for the previous commits. Urgh.

Make ephy_location_entry_set_match_func directly pass the user_data received
(as it should be), and pass an EphyLocationEntry to it in
ephy-location-action.c

Modified:
   branches/gnome-2-26/lib/widgets/ephy-location-entry.c
   branches/gnome-2-26/src/ephy-location-action.c

Modified: branches/gnome-2-26/lib/widgets/ephy-location-entry.c
==============================================================================
--- branches/gnome-2-26/lib/widgets/ephy-location-entry.c	(original)
+++ branches/gnome-2-26/lib/widgets/ephy-location-entry.c	Tue Jan 13 21:55:24 2009
@@ -996,7 +996,7 @@
 	GtkEntryCompletion *completion;
 	
 	completion = gtk_entry_get_completion (GTK_ENTRY (priv->icon_entry->entry));
-	gtk_entry_completion_set_match_func (completion, match_func, le, notify);
+	gtk_entry_completion_set_match_func (completion, match_func, user_data, notify);
 }
 
 void

Modified: branches/gnome-2-26/src/ephy-location-action.c
==============================================================================
--- branches/gnome-2-26/src/ephy-location-action.c	(original)
+++ branches/gnome-2-26/src/ephy-location-action.c	Tue Jan 13 21:55:24 2009
@@ -392,7 +392,7 @@
 		
 		ephy_location_entry_set_match_func (EPHY_LOCATION_ENTRY (proxy),
 							match_func,
-							NULL,
+							proxy,
 							NULL);
 
 		add_completion_actions (action, proxy);