[monkey-bubble: 257/753] port to HEAD.

[Sven Herzberg <herzi src gnome org>]

commit 6499f6e4d5c3975b4d9f35ef87dca101959e4236
Author: Michael Meeks <michael ximian com>
Date:   Wed May 2 23:56:37 2001 +0000

    port to HEAD.
    
    2001-05-03  Michael Meeks  <michael ximian com>
    
    	* monikers/bonobo-stream-cache.[ch]: port to HEAD.
    
    	* bonobo/bonobo-stream-memory.c (bonobo_stream_mem_get_type):
    	fix class size buglet
    
    	* monikers/bonobo-stream-cache.c (create_stream_cache_server):
    	kill.

 monikers/bonobo-moniker-extender-file.c |    2 +-
 monikers/bonobo-moniker-file.c          |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/monikers/bonobo-moniker-extender-file.c b/monikers/bonobo-moniker-extender-file.c
index e882c08..ba9287e 100644
--- a/monikers/bonobo-moniker-extender-file.c
+++ b/monikers/bonobo-moniker-extender-file.c
@@ -12,7 +12,7 @@
 #include <bonobo/bonobo-moniker.h>
 #include <bonobo/bonobo-moniker-extender.h>
 #include <bonobo/bonobo-moniker-util.h>
-#include <libgnome/gnome-mime.h>
+/* #include <libgnome/gnome-mime.h> */
 #include <liboaf/liboaf.h>
 
 #include "bonobo-moniker-std.h"
diff --git a/monikers/bonobo-moniker-file.c b/monikers/bonobo-moniker-file.c
index b23d74b..7201665 100644
--- a/monikers/bonobo-moniker-file.c
+++ b/monikers/bonobo-moniker-file.c
@@ -29,7 +29,10 @@ bonobo_moniker_file_resolve (BonoboMoniker               *moniker,
 		BonoboStream *stream;
 		
 		stream = bonobo_stream_open ("fs", fname,
-					     Bonobo_Storage_READ, 0664);
+					     Bonobo_Storage_READ, 0664, ev);
+
+		if (BONOBO_EX (ev))
+			return CORBA_OBJECT_NIL;
 
 		if (!stream) {
 			g_warning ("Failed to open stream '%s'", fname);