epiphany r8453 - branches/gnome-2-24/lib/widgets

[lminier svn gnome org]

Author: lminier
Date: Tue Sep  2 19:59:35 2008
New Revision: 8453
URL: http://svn.gnome.org/viewvc/epiphany?rev=8453&view=rev

Log:
Merge r8452 from trunk; revert special handling of double click in the
LocationEntry; bug #426349.


Modified:
   branches/gnome-2-24/lib/widgets/ephy-location-entry.c

Modified: branches/gnome-2-24/lib/widgets/ephy-location-entry.c
==============================================================================
--- branches/gnome-2-24/lib/widgets/ephy-location-entry.c	(original)
+++ branches/gnome-2-24/lib/widgets/ephy-location-entry.c	Tue Sep  2 19:59:35 2008
@@ -373,18 +373,6 @@
 }
 
 static gboolean
-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le)
-{
-	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
-	{
-		ephy_location_entry_activate (le);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
 entry_key_press_cb (GtkEntry *entry,
 		    GdkEventKey *event,
 		    EphyLocationEntry *lentry)
@@ -911,8 +899,6 @@
 				G_CALLBACK (entry_key_press_after_cb), entry);
 	g_signal_connect_after (priv->icon_entry->entry, "activate",
 				G_CALLBACK (entry_activate_after_cb), entry);
-	g_signal_connect (priv->icon_entry->entry, "button-press-event",
-			  G_CALLBACK (entry_button_press_cb), entry);
 	g_signal_connect (priv->icon_entry->entry, "changed",
 			  G_CALLBACK (editable_changed_cb), entry);
 	g_signal_connect (priv->icon_entry->entry, "drag-motion",