Minor cleanup from Jaap Haitsma <jaap@haitsma.org>GNOME_2_10_BRANCHPOINT

2005-03-22  Alexander Larsson  <alexl@redhat.com>

	* src/nautilus-location-entry.c:
	Minor cleanup from Jaap Haitsma <jaap@haitsma.org>

2 files changed, 17 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index f9be72fe6..592d3c6b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,22 @@
 2005-03-22  Alexander Larsson  <alexl@redhat.com>
 
-	reviewed by: <delete if not using a buddy>
+	* src/nautilus-location-entry.c:
+	Minor cleanup from Jaap Haitsma <jaap@haitsma.org>
 
-	* libnautilus-private/nautilus-window-info.c:
-	(nautilus_window_info_show_window):
-	* libnautilus-private/nautilus-window-info.h:
-	* src/file-manager/fm-directory-view.c: (finish_loading):
+2005-03-22  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-window-info.[ch]:
+	Add nautilus_window_info_show_window call.
+	
+	* src/file-manager/fm-directory-view.c:
 	* src/nautilus-window-manage-views.c:
-	(location_has_really_changed):
-	* src/nautilus-window.c: (nautilus_window_show_window),
-	(nautilus_window_set_viewed_file),
-	(nautilus_window_info_iface_init):
-	* src/nautilus-window.h:
+	* src/nautilus-window.[ch]:
+	Implement and call the new show_window call.
+	This allows us to set up the EelBackground before
+	showing the window, causing less flicker (#169347)
 
+	Patch from Nickolay V. Shmyrev  
+	
 2005-03-16  Alexander Larsson  <alexl@redhat.com>
 
 	* configure.in:
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index a2c8f504b..5fc9afef8 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -379,11 +379,10 @@ position_and_selection_are_at_end (GtkEditable *editable)
 static void
 editable_event_after_callback (GtkEntry *entry,
 			       GdkEvent *event,
-			       gpointer user_data)
+			       NautilusLocationEntry *location_entry)
 {
 	GtkEditable *editable;
 	GdkEventKey *keyevent;
-	NautilusLocationEntry *location_entry;
 
 	if (event->type != GDK_KEY_PRESS) {
 		return;
@@ -391,7 +390,6 @@ editable_event_after_callback (GtkEntry *entry,
 
 	editable = GTK_EDITABLE (entry);
 	keyevent = (GdkEventKey *)event;
-	location_entry = NAUTILUS_LOCATION_ENTRY (user_data);
 
 	/* After typing the right arrow key we move the selection to
 	 * the end, if we have a valid selection - since this is most
@@ -482,8 +480,8 @@ nautilus_location_entry_init (NautilusLocationEntry *entry)
 
 	nautilus_entry_set_special_tab_handling (NAUTILUS_ENTRY (entry), TRUE);
 
-	g_signal_connect_object (entry, "event_after",
-				 G_CALLBACK (editable_event_after_callback), entry, 0);
+	g_signal_connect (entry, "event_after",
+		          G_CALLBACK (editable_event_after_callback), entry);
 
 }