[nautilus] bookmark: don't call into nautilus_file methods unconditionally

[Cosimo Cecchi <cosimoc src gnome org>]

commit f4637ff4481ee6d7d1e0453a5bd3ec4ac9dca17d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jan 14 18:26:56 2011 +0100

    bookmark: don't call into nautilus_file methods unconditionally
    
    As NautilusBookmark's file might be NULL in some cases.

 libnautilus-private/nautilus-bookmark.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 0f9033e..3cbcf94 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -94,6 +94,10 @@ nautilus_bookmark_update_icon (NautilusBookmark *bookmark)
 {
 	GIcon *new_icon;
 
+	if (bookmark->details->file == NULL) {
+		return;
+	}
+
 	if (!nautilus_file_is_local (bookmark->details->file)) {
 		/* never update icons for remote bookmarks */
 		return;
@@ -179,6 +183,7 @@ bookmark_file_changed_callback (NautilusFile *file,
 		nautilus_bookmark_disconnect_file (bookmark);
 	} else {
 		nautilus_bookmark_update_icon (bookmark);
+		bookmark_set_name_from_ready_file (bookmark, file);
 	}
 }
 
@@ -258,7 +263,8 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark)
 		nautilus_bookmark_set_icon_to_default (bookmark);
 	}
 
-	if (nautilus_file_check_if_ready (bookmark->details->file, NAUTILUS_FILE_ATTRIBUTE_INFO)) {
+	if (bookmark->details->file != NULL &&
+	    nautilus_file_check_if_ready (bookmark->details->file, NAUTILUS_FILE_ATTRIBUTE_INFO)) {
 		bookmark_set_name_from_ready_file (bookmark, bookmark->details->file);
 	}