gnome-vfs r5470 - in trunk: . libgnomevfs

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Apr 16 21:10:38 2008
New Revision: 5470
URL: http://svn.gnome.org/viewvc/gnome-vfs?rev=5470&view=rev

Log:
2008-04-16  Matthias Clasen  <mclasen redhat com>

        Partically revert the last commit after realizing that
        xdg_mime_media_type_equal doesn't have to init at all.

        * libgnomevfs/xdgmime.h:
        * libgnomevfs/xdgmime.c: Get rid of _xdg_mime_media_type_equal

        * libgnomevfs/xdgmimecache.c: Use xdg_mime_media_type_equal




Modified:
   trunk/ChangeLog
   trunk/libgnomevfs/xdgmime.c
   trunk/libgnomevfs/xdgmime.h
   trunk/libgnomevfs/xdgmimecache.c

Modified: trunk/libgnomevfs/xdgmime.c
==============================================================================
--- trunk/libgnomevfs/xdgmime.c	(original)
+++ trunk/libgnomevfs/xdgmime.c	Wed Apr 16 21:10:38 2008
@@ -675,8 +675,6 @@
 {
   char *sep;
 
-  xdg_mime_init ();
-
   sep = strchr (mime_a, '/');
   
   if (sep && strncmp (mime_a, mime_b, sep - mime_a + 1) == 0)

Modified: trunk/libgnomevfs/xdgmime.h
==============================================================================
--- trunk/libgnomevfs/xdgmime.h	(original)
+++ trunk/libgnomevfs/xdgmime.h	Wed Apr 16 21:10:38 2008
@@ -102,8 +102,6 @@
    /* Private versions of functions that don't call xdg_mime_init () */
 int          _xdg_mime_mime_type_equal             (const char *mime_a,
 						    const char *mime_b);
-int          _xdg_mime_media_type_equal            (const char *mime_a,
-						    const char *mime_b);
 int          _xdg_mime_mime_type_subclass          (const char *mime,
 						    const char *base);
 const char  *_xdg_mime_unalias_mime_type	   (const char *mime);

Modified: trunk/libgnomevfs/xdgmimecache.c
==============================================================================
--- trunk/libgnomevfs/xdgmimecache.c	(original)
+++ trunk/libgnomevfs/xdgmimecache.c	Wed Apr 16 21:10:38 2008
@@ -297,7 +297,7 @@
 	  for (n = 0; n < n_mime_types; n++)
 	    {
 	      if (mime_types[n] && 
-		  xdg_mime_mime_type_equal (mime_types[n], non_match))
+		  _xdg_mime_mime_type_equal (mime_types[n], non_match))
 		mime_types[n] = NULL;
 	    }
 	}