Synced with upstream, a little

moo/mooutils/xdgmime/test-mime.c

@@ -22,7 +22,6 @@
  */
 #include "xdgmime.h"
 #include "xdgmimeglob.h"
-#include "xdgmimeint.h"
 #include <string.h>
 #include <stdio.h>
 

moo/mooutils/xdgmime/xdgmime.c

@@ -63,7 +63,7 @@ static XdgCallbackList *callback_list = NULL;
 XdgMimeCache **_xdg_mime_caches = NULL;
 static int n_caches = 0;
 
-const char *xdg_mime_type_unknown = "application/octet-stream";
+const char xdg_mime_type_unknown[] = "application/octet-stream";
 
 
 enum

moo/mooutils/xdgmime/xdgmime.h

@@ -68,7 +68,7 @@ typedef void (*XdgMimeDestroy)  (void *user_data);
 
 const char  *xdg_mime_intern_mime_type             (const char *mime_type);
 
-extern const char *xdg_mime_type_unknown;
+extern const char xdg_mime_type_unknown[];
 #define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown
 
 const char  *xdg_mime_get_mime_type_for_data       (const void *data,

moo/mooutils/xdgmime/xdgmimealias.c

@@ -29,13 +29,13 @@
 #include <config.h>
 #endif
 
-#define _GNU_SOURCE
 #include "xdgmimealias.h"
 #include "xdgmimeint.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
+#include <fnmatch.h>
 
 #ifndef	FALSE
 #define	FALSE	(0)
@@ -105,7 +105,7 @@ _xdg_mime_alias_list_lookup (XdgAliasList *list,
   if (list->n_aliases > 0)
     {
       key.alias = (char *)alias;
-      key.mime_type = 0;
+      key.mime_type = NULL;
 
       entry = bsearch (&key, list->aliases, list->n_aliases,
 		       sizeof (XdgAlias), alias_entry_cmp);

moo/mooutils/xdgmime/xdgmimeint.c

@@ -133,7 +133,8 @@ _xdg_ucs4_to_lower (xdg_unichar_t source)
 int
 _xdg_utf8_validate (const char *source)
 {
-  return g_utf8_validate (source, -1, NULL);
+  /* FIXME: actually write */
+  return TRUE;
 }
 
 const char *

moo/mooutils/xdgmime/xdgmimemagic.h

@@ -33,7 +33,6 @@
 typedef struct XdgMimeMagic XdgMimeMagic;
 
 #ifdef XDG_PREFIX
-#define _xdg_mime_glob_read_from_file             XDG_ENTRY(glob_read_from_file)
 #define _xdg_mime_magic_new                       XDG_ENTRY(magic_new)
 #define _xdg_mime_magic_read_from_file            XDG_ENTRY(magic_read_from_file)
 #define _xdg_mime_magic_free                      XDG_ENTRY(magic_free)

moo/mooutils/xdgmime/xdgmimeparent.c

@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
+#include <fnmatch.h>
 
 #ifndef	FALSE
 #define	FALSE	(0)