nautilus r14382 - in trunk: . src

[cneumair svn gnome org]

Author: cneumair
Date: Mon Jul 21 09:28:22 2008
New Revision: 14382
URL: http://svn.gnome.org/viewvc/nautilus?rev=14382&view=rev

Log:
2008-07-21  Christian Neumair  <cneumair gnome org>

	* src/nautilus-location-bar.c (editable_activate_callback),
	(nautilus_location_bar_init):
	Do not emit "location-changed" if the entry is empty. Fixes #543936.
	Thanks to Diego Escalante Urrelo.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-location-bar.c

Modified: trunk/src/nautilus-location-bar.c
==============================================================================
--- trunk/src/nautilus-location-bar.c	(original)
+++ trunk/src/nautilus-location-bar.c	Mon Jul 21 09:28:22 2008
@@ -305,6 +305,21 @@
 }
 
 static void
+editable_activate_callback (GtkEntry *entry,
+			    gpointer user_data)
+{
+	NautilusNavigationBar *bar;
+	const char *entry_text;
+
+	bar = NAUTILUS_NAVIGATION_BAR (user_data);
+
+	entry_text = gtk_entry_get_text (entry);
+	if (entry_text != NULL && *entry_text != '\0') {
+		nautilus_navigation_bar_location_changed (bar);
+	}
+}
+
+static void
 editable_event_after_callback (GtkEntry *entry,
 			       GdkEvent *event,
 			       gpointer user_data)
@@ -417,8 +432,7 @@
 	entry = nautilus_location_entry_new ();
 	
 	g_signal_connect_object (entry, "activate",
-				 G_CALLBACK (nautilus_navigation_bar_location_changed),
-				 bar, G_CONNECT_SWAPPED);
+				 G_CALLBACK (editable_activate_callback), bar, 0);
 	g_signal_connect_object (entry, "event_after",
 				 G_CALLBACK (editable_event_after_callback), bar, G_CONNECT_AFTER);