Made preview bug 2017 no longer crash. That's the "Up button

	in search results" one. Darin is planning to make it be
	disabled like it should have been, which is a fix in gnome-vfs.
	Special dispensation from Robin to check this in.

	* src/nautilus-window.c: (nautilus_window_go_up): Check for
	NULL parent_uri and bail out if so.

5 files changed, 34 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c3b550c6..7f67816b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-08-07  John Sullivan  <sullivan@eazel.com>
 
+	Made preview bug 2017 no longer crash. That's the "Up button
+	in search results" one. Darin is planning to make it be
+	disabled like it should have been, which is a fix in gnome-vfs.
+	Special dispensation from Robin to check this in.
+
+	* src/nautilus-window.c: (nautilus_window_go_up): Check for
+	NULL parent_uri and bail out if so.
+
+2000-08-07  John Sullivan  <sullivan@eazel.com>
+
 	Part of bug 2005 (Should display error message when search
 	fails because search demon isn't running)
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index bf365badd..8f3c1c2dc 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -930,6 +930,12 @@ nautilus_window_go_up (NautilusWindow *window)
 	current_uri = gnome_vfs_uri_new (window->location);
 	parent_uri = gnome_vfs_uri_get_parent (current_uri);
 	gnome_vfs_uri_unref (current_uri);
+
+	if (parent_uri == NULL) {
+		g_warning ("Can't go Up from here. The UI should have prevented us from getting this far.");
+		return;
+	}
+	
 	parent_uri_string = gnome_vfs_uri_to_string (parent_uri, GNOME_VFS_URI_HIDE_NONE);
 	gnome_vfs_uri_unref (parent_uri);  
 	
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index bf365badd..8f3c1c2dc 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -930,6 +930,12 @@ nautilus_window_go_up (NautilusWindow *window)
 	current_uri = gnome_vfs_uri_new (window->location);
 	parent_uri = gnome_vfs_uri_get_parent (current_uri);
 	gnome_vfs_uri_unref (current_uri);
+
+	if (parent_uri == NULL) {
+		g_warning ("Can't go Up from here. The UI should have prevented us from getting this far.");
+		return;
+	}
+	
 	parent_uri_string = gnome_vfs_uri_to_string (parent_uri, GNOME_VFS_URI_HIDE_NONE);
 	gnome_vfs_uri_unref (parent_uri);  
 	
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index bf365badd..8f3c1c2dc 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -930,6 +930,12 @@ nautilus_window_go_up (NautilusWindow *window)
 	current_uri = gnome_vfs_uri_new (window->location);
 	parent_uri = gnome_vfs_uri_get_parent (current_uri);
 	gnome_vfs_uri_unref (current_uri);
+
+	if (parent_uri == NULL) {
+		g_warning ("Can't go Up from here. The UI should have prevented us from getting this far.");
+		return;
+	}
+	
 	parent_uri_string = gnome_vfs_uri_to_string (parent_uri, GNOME_VFS_URI_HIDE_NONE);
 	gnome_vfs_uri_unref (parent_uri);  
 	
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index bf365badd..8f3c1c2dc 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -930,6 +930,12 @@ nautilus_window_go_up (NautilusWindow *window)
 	current_uri = gnome_vfs_uri_new (window->location);
 	parent_uri = gnome_vfs_uri_get_parent (current_uri);
 	gnome_vfs_uri_unref (current_uri);
+
+	if (parent_uri == NULL) {
+		g_warning ("Can't go Up from here. The UI should have prevented us from getting this far.");
+		return;
+	}
+	
 	parent_uri_string = gnome_vfs_uri_to_string (parent_uri, GNOME_VFS_URI_HIDE_NONE);
 	gnome_vfs_uri_unref (parent_uri);