Handle case where directory is NULL which is needed for URIs that

Nautilus understands but GNOME VFS does not.

4 files changed, 39 insertions, 9 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 62a5b6a77..ae864bf25 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,11 @@
+2000-04-11  Darin Adler  <darin@eazel.com>
+
+	* libnautilus/nautilus-directory.c
+	(nautilus_directory_call_when_ready),
+	(nautilus_directory_call_when_ready_internal): Handle case where
+	directory is NULL which is needed for URIs that Nautilus
+	understand but GNOME VFS does not.
+
 2000-04-11  John Sullivan  <sullivan@eazel.com>
 
 	Addressed most of task 148 (Better type-as-string for
@@ -37,6 +45,28 @@
 	beneath icons (in addition to just plain "type", which is
 	the human-language one).
 
+2000-04-11  Gene Z. Ragan  <gzr@eazel.com>
+
+	Requires new Bonobo.
+
+	* components/sample/nautilus-sample-content-view.c
+	Added icon data to BonoboUiHandler.  This is GdkPixbuf
+	data and demonstrates the pixbuf data features
+	added to bonobo ui handlers.
+
+	* libnautilus/nautilus-bookmark.c
+	bonobo_ui_handler_menu_new_item modified to take advantage
+	of new bonobo ui handler pixbuf functionality. Components and
+	menu items can now display pixbuf data.
+	Added nautilus_bookmark_get_pixbuf() routine.
+
+	* libnautilus/nautilus-bookmark.h
+	Added nautilus_bookmark_get_pixbuf() routine.
+
+	* src/nautilus-window-menus.c
+	bonobo_ui_handler_menu_new_item modified to take advantage
+	of new bonobo ui handler pixbuf functionality.
+
 2000-04-11  Darin Adler  <darin@eazel.com>
 
 	Finished task 226 (Read metadata asynchronously instead of
diff --git a/libnautilus-extensions/nautilus-directory.c b/libnautilus-extensions/nautilus-directory.c
index f37938a07..0605dcb0f 100644
--- a/libnautilus-extensions/nautilus-directory.c
+++ b/libnautilus-extensions/nautilus-directory.c
@@ -1371,12 +1371,12 @@ void
 nautilus_directory_call_when_ready_internal (NautilusDirectory *directory,
 					     const QueuedCallback *callback)
 {
-	g_assert (NAUTILUS_IS_DIRECTORY (directory));
+	g_assert (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_assert (callback != NULL);
 	g_assert (callback->file == NULL || callback->file->details->directory == directory);
 
 	/* Call back right away if it's already ready. */
-	if (directory->details->metafile_read) {
+	if (directory == NULL || directory->details->metafile_read) {
 		if (callback->file != NULL) {
 			(* callback->callback.file) (callback->file,
 						     callback->callback_data);
@@ -1411,7 +1411,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 {
 	QueuedCallback new_callback;
 
-	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
+	g_return_if_fail (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (directory_metadata_keys != NULL || file_metadata_keys != NULL);
 	g_return_if_fail (callback != NULL);
 
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index f37938a07..0605dcb0f 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -1371,12 +1371,12 @@ void
 nautilus_directory_call_when_ready_internal (NautilusDirectory *directory,
 					     const QueuedCallback *callback)
 {
-	g_assert (NAUTILUS_IS_DIRECTORY (directory));
+	g_assert (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_assert (callback != NULL);
 	g_assert (callback->file == NULL || callback->file->details->directory == directory);
 
 	/* Call back right away if it's already ready. */
-	if (directory->details->metafile_read) {
+	if (directory == NULL || directory->details->metafile_read) {
 		if (callback->file != NULL) {
 			(* callback->callback.file) (callback->file,
 						     callback->callback_data);
@@ -1411,7 +1411,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 {
 	QueuedCallback new_callback;
 
-	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
+	g_return_if_fail (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (directory_metadata_keys != NULL || file_metadata_keys != NULL);
 	g_return_if_fail (callback != NULL);
 
diff --git a/libnautilus/nautilus-directory.c b/libnautilus/nautilus-directory.c
index f37938a07..0605dcb0f 100644
--- a/libnautilus/nautilus-directory.c
+++ b/libnautilus/nautilus-directory.c
@@ -1371,12 +1371,12 @@ void
 nautilus_directory_call_when_ready_internal (NautilusDirectory *directory,
 					     const QueuedCallback *callback)
 {
-	g_assert (NAUTILUS_IS_DIRECTORY (directory));
+	g_assert (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_assert (callback != NULL);
 	g_assert (callback->file == NULL || callback->file->details->directory == directory);
 
 	/* Call back right away if it's already ready. */
-	if (directory->details->metafile_read) {
+	if (directory == NULL || directory->details->metafile_read) {
 		if (callback->file != NULL) {
 			(* callback->callback.file) (callback->file,
 						     callback->callback_data);
@@ -1411,7 +1411,7 @@ nautilus_directory_call_when_ready (NautilusDirectory *directory,
 {
 	QueuedCallback new_callback;
 
-	g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
+	g_return_if_fail (directory == NULL || NAUTILUS_IS_DIRECTORY (directory));
 	g_return_if_fail (directory_metadata_keys != NULL || file_metadata_keys != NULL);
 	g_return_if_fail (callback != NULL);