[monkey-bubble: 522/753] Use gnome_vfs_mime_type_from_name(), not gnome_mime_type_from_file().

[Sven Herzberg <herzi src gnome org>]

commit b2bf0e1362df9c6fbfa7606022a372fbb3dc945a
Author: Martin Baulig <baulig suse de>
Date:   Wed Jul 11 17:32:18 2001 +0000

    Use gnome_vfs_mime_type_from_name(), not gnome_mime_type_from_file().
    
    2001-07-11  Martin Baulig  <baulig suse de>
    
    	* bonobo-storage-fs.c, bonobo-moniker-extender-file: Use
    	gnome_vfs_mime_type_from_name(), not gnome_mime_type_from_file().
    
    	* bonobo-config-ditem-utils.c: Removed ORBit2 conditionals,
    	always use ORBit2.

 monikers/ChangeLog                      |    8 ++++++++
 monikers/bonobo-moniker-extender-file.c |    6 +++---
 monikers/bonobo-moniker-vfs.c           |    1 +
 monikers/bonobo-storage-fs.c            |    5 +++--
 4 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 0e5b418..83753bb 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-11  Martin Baulig  <baulig suse de>
+
+	* bonobo-storage-fs.c, bonobo-moniker-extender-file: Use
+	gnome_vfs_mime_type_from_name(), not gnome_mime_type_from_file().
+
+	* bonobo-config-ditem-utils.c: Removed ORBit2 conditionals,
+	always use ORBit2.
+
 2001-07-10  Michael Meeks  <michael ximian com>
 
 	* bonobo-moniker-vfs.c: add.
diff --git a/monikers/bonobo-moniker-extender-file.c b/monikers/bonobo-moniker-extender-file.c
index 0ee23f9..0fa9e2a 100644
--- a/monikers/bonobo-moniker-extender-file.c
+++ b/monikers/bonobo-moniker-extender-file.c
@@ -13,7 +13,7 @@
 #include <bonobo/bonobo-moniker.h>
 #include <bonobo/bonobo-moniker-extender.h>
 #include <bonobo/bonobo-moniker-util.h>
-/* #include <libgnome/gnome-mime.h> */
+#include <libgnomevfs/gnome-vfs-mime.h>
 #include <liboaf/liboaf.h>
 
 #include "gnome-moniker-std.h"
@@ -42,7 +42,7 @@ bonobo_file_extender_resolve (BonoboMonikerExtender *extender,
 
 	g_warning ("Filename : '%s'", fname);
 
-	mime_type = gnome_mime_type (fname);
+	mime_type = gnome_vfs_mime_type_from_name (fname);
 
 	oaf_requirements = g_strdup_printf (
 		"bonobo:supported_mime_types.has ('%s') AND repo_ids.has ('%s') AND "
@@ -60,7 +60,7 @@ bonobo_file_extender_resolve (BonoboMonikerExtender *extender,
 
 	CORBA_free (result);
 
-	object = bonobo_url_lookup (oafiid, display_name, ev);
+	object = bonobo_url_lookup (oafiid, (gchar *) display_name, ev);
 	if (!BONOBO_EX (ev) && object != CORBA_OBJECT_NIL) {
 		g_free (oafiid);
 		Bonobo_Unknown_ref (object, ev);
diff --git a/monikers/bonobo-moniker-vfs.c b/monikers/bonobo-moniker-vfs.c
index b4b4598..f6e85de 100644
--- a/monikers/bonobo-moniker-vfs.c
+++ b/monikers/bonobo-moniker-vfs.c
@@ -16,6 +16,7 @@
 
 #include "gnome-moniker-std.h"
 #include "bonobo-stream-vfs.h"
+#include "bonobo-storage-vfs.h"
 
 Bonobo_Unknown
 bonobo_moniker_vfs_resolve (BonoboMoniker               *moniker,
diff --git a/monikers/bonobo-storage-fs.c b/monikers/bonobo-storage-fs.c
index 1d6f988..b45bb34 100644
--- a/monikers/bonobo-storage-fs.c
+++ b/monikers/bonobo-storage-fs.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 
 #include <libgnome/gnome-util.h>
+#include <libgnomevfs/gnome-vfs-mime.h>
 #include <bonobo/bonobo-storage.h>
 
 #include "bonobo-stream-fs.h"
@@ -80,7 +81,7 @@ fs_get_info (PortableServer_Servant storage,
 		else
 			si->content_type = 
 				CORBA_string_dup (
-					gnome_mime_type_of_file (full));
+					gnome_vfs_mime_type_from_name (full));
 	}
 
 	g_free (full);
@@ -317,7 +318,7 @@ fs_list_contents (PortableServer_Servant   storage,
 			buf [i].type = Bonobo_STORAGE_TYPE_REGULAR;
 			buf [i].content_type = 
 				CORBA_string_dup (
-					gnome_mime_type_of_file (full));
+					gnome_vfs_mime_type_from_name (full));
 		}
 
 		g_free (full);