[monkey-bubble: 560/753] fix the factory name so it is what it says it is.

[Sven Herzberg <herzi src gnome org>]

commit 9cbec7e341f3c7c48bde1d7d86a878ed4739a777
Author: Michael Meeks <michael ximian com>
Date:   Fri Jul 27 18:29:46 2001 +0000

    fix the factory name so it is what it says it is.
    
    2001-07-27  Michael Meeks  <michael ximian com>
    
    	* gnome-moniker-std.c: fix the factory name so it is what it
    	says it is.
    
    	* GNOME_Moniker_std.oaf.in.in: fix the shlib factory path.
    
    	* Makefile.am (clean-local): actualy install the monikers.
    	use xml-i18n-tools.

 monikers/ChangeLog           |    5 ++++-
 monikers/bonobo-stream-fs.c  |    3 ++-
 monikers/gnome-moniker-std.c |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 2eb6cae..271dad6 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,6 +1,9 @@
 2001-07-27  Michael Meeks  <michael ximian com>
 
-	* GNOME_Moniker_std.oaf.in.in: fix the shlib factory name.
+	* gnome-moniker-std.c: fix the factory name so it is what it
+	says it is.
+
+	* GNOME_Moniker_std.oaf.in.in: fix the shlib factory path.
 
 	* Makefile.am (clean-local): actualy install the monikers.
 	use xml-i18n-tools.
diff --git a/monikers/bonobo-stream-fs.c b/monikers/bonobo-stream-fs.c
index d69115a..b6f5fab 100644
--- a/monikers/bonobo-stream-fs.c
+++ b/monikers/bonobo-stream-fs.c
@@ -234,7 +234,8 @@ fs_destroy (BonoboObject *object)
 {
 	BonoboStreamFS *stream_fs = BONOBO_STREAM_FS (object);
 	
-	if (close (stream_fs->fd)) 
+	if (stream_fs->fd >= 0 &&
+	    close (stream_fs->fd))
 		g_warning ("Close failed");
 	stream_fs->fd = -1;
 
diff --git a/monikers/gnome-moniker-std.c b/monikers/gnome-moniker-std.c
index 72b5d17..8167902 100644
--- a/monikers/gnome-moniker-std.c
+++ b/monikers/gnome-moniker-std.c
@@ -33,7 +33,7 @@ bonobo_std_moniker_factory (BonoboGenericFactory *this,
 }
 
 
-BONOBO_OAF_SHLIB_FACTORY_MULTI ("OAFIID:Bonobo_Moniker_std_Factory",
+BONOBO_OAF_SHLIB_FACTORY_MULTI ("OAFIID:GNOME_Moniker_std_Factory",
 				"bonobo standard moniker",
 				bonobo_std_moniker_factory,
 				NULL);