# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1191270880 18000
# Node ID c276e2b74646320e5153b5ee960dfd9d749c3f50
# Parent  31e9908cf91e66b59d4c7fce46c7fa44ce6af89e
Backed out changeset 31e9908cf91e
It has been decided that using libmagic is a bad idea due to false positives.

diff -r 31e9908cf91e -r c276e2b74646 src/stdio/Makefile
--- a/src/stdio/Makefile	Sun Sep 30 11:44:20 2007 -0500
+++ b/src/stdio/Makefile	Mon Oct 01 15:34:40 2007 -0500
@@ -8,4 +8,4 @@
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} -lmagic
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r 31e9908cf91e -r c276e2b74646 src/stdio/stdio.c
--- a/src/stdio/stdio.c	Sun Sep 30 11:44:20 2007 -0500
+++ b/src/stdio/stdio.c	Mon Oct 01 15:34:40 2007 -0500
@@ -27,8 +27,6 @@
 
 #include <string.h>
 
-#include <magic.h>
-
 static gchar *
 vfs_stdio_urldecode_path(const gchar * encoded_path)
 {
@@ -251,28 +249,6 @@
     return s.st_size;
 }
 
-static magic_t mdb_handle = NULL;
-
-gchar *
-stdio_vfs_metadata_impl(VFSFile *file, const gchar *field)
-{
-    if (!g_ascii_strcasecmp(field, "content-type"))
-    {
-        gchar *decpath;
-        const gchar *out;
-
-        if (mdb_handle == NULL)
-            mdb_handle = magic_open(MAGIC_MIME);
-
-        decpath = vfs_stdio_urldecode_path(file->uri);
-        out = magic_file(mdb_handle, decpath);
-
-        return g_strdup(out);
-    }
-
-    return NULL;
-}
-
 VFSConstructor file_const = {
 	"file://",
 	stdio_vfs_fopen_impl,
@@ -286,8 +262,7 @@
 	stdio_vfs_ftell_impl,
 	stdio_vfs_feof_impl,
 	stdio_vfs_truncate_impl,
-	stdio_vfs_fsize_impl,
-	stdio_vfs_metadata_impl
+	stdio_vfs_fsize_impl
 };
 
 static void init(void)