Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.1751
diff -u -p -r1.1751 ChangeLog
--- ChangeLog	2 Mar 2004 14:13:11 -0000	1.1751
+++ ChangeLog	3 Mar 2004 10:28:53 -0000
@@ -1,3 +1,8 @@
+2004-03-03  Alexander Larsson  <alexl@redhat.com>
+
+	* modules/file-method.c (do_monitor_add):
+	Handle NULL filenames correctly.
+
 2004-03-02  Alexander Larsson  <alexl@redhat.com>
 
 	* libgnomevfs/gnome-vfs-volume-monitor-client.c:
Index: modules/file-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/file-method.c,v
retrieving revision 1.126
diff -u -p -r1.126 file-method.c
--- modules/file-method.c	25 Feb 2004 09:28:53 -0000	1.126
+++ modules/file-method.c	3 Mar 2004 10:28:54 -0000
@@ -2301,11 +2301,15 @@ do_monitor_add (GnomeVFSMethod *method,
 		return GNOME_VFS_ERROR_NOT_SUPPORTED;
 	}
 
+	filename = get_path_from_uri (uri);
+	if (filename == NULL) {
+		return GNOME_VFS_ERROR_INVALID_URI;
+	}
+	
 	handle = g_new0 (FileMonitorHandle, 1);
 	handle->uri = uri;
 	handle->cancelled = FALSE;
 	gnome_vfs_uri_ref (uri);
-	filename = get_path_from_uri (uri);
 
 	G_LOCK (fam_connection);
 	/* We need to queue up incoming messages to avoid blocking on write
