Load mime->vfs module mapping from gnome-vfs.

* Load mime->vfs module mapping from gnome-vfs.

1 files changed, 6 insertions, 13 deletions

diff --git a/libnautilus-extensions/nautilus-mime-actions.c b/libnautilus-extensions/nautilus-mime-actions.c
index 32a259cf1..5ecc2f9d6 100644
--- a/libnautilus-extensions/nautilus-mime-actions.c
+++ b/libnautilus-extensions/nautilus-mime-actions.c
@@ -27,6 +27,7 @@
 
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
+#include <libgnomevfs/gnome-vfs-mime-info.h>
 #include "nautilus-lib-self-check-functions.h"
 #include "nautilus-directory.h"
 #include "nautilus-file.h"
@@ -544,25 +545,17 @@ nautilus_mime_get_short_list_components_for_uri (const char *uri)
 	return result;
 }
 
-GList *
+gchar *
 nautilus_mime_get_short_list_methods_for_uri (const char *uri)
 {
 	gchar *mime_type = get_mime_type_from_uri (uri);
+	const gchar *method = gnome_vfs_mime_get_value (mime_type, "vfs-method");
 
-	/* FIXME - load these mappings from gnome-vfs and/or a config file */
-
-	if (mime_type == NULL) return NULL;
-
-	if (!strcmp(mime_type, "application/x-gzip"))
-		return g_list_append(NULL, "gzip");
-
-	if (!strcmp(mime_type, "application/x-bzip"))
-		return g_list_append(NULL, "bzip2");
+	g_free(mime_type);
 
-	if (!strcmp(mime_type, "application/zip"))
-		return g_list_append(NULL, "zip");
+	if (method == NULL) return NULL;
 
-	return NULL;
+	return g_strdup(method);
 }