glib r6858 - in branches/glib-2-16/gio: . xdgmime

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Apr 16 18:16:12 2008
New Revision: 6858
URL: http://svn.gnome.org/viewvc/glib?rev=6858&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.

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

        * xdgmime/xdgmimecache.c: Use xdg_mime_media_type_equal


Modified:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/xdgmime/xdgmime.c
   branches/glib-2-16/gio/xdgmime/xdgmime.h
   branches/glib-2-16/gio/xdgmime/xdgmimecache.c

Modified: branches/glib-2-16/gio/xdgmime/xdgmime.c
==============================================================================
--- branches/glib-2-16/gio/xdgmime/xdgmime.c	(original)
+++ branches/glib-2-16/gio/xdgmime/xdgmime.c	Wed Apr 16 18:16:12 2008
@@ -684,8 +684,8 @@
 }
 
 int
-_xdg_mime_media_type_equal (const char *mime_a,
-			    const char *mime_b)
+xdg_mime_media_type_equal (const char *mime_a,
+		           const char *mime_b)
 {
   char *sep;
 
@@ -697,15 +697,6 @@
   return 0;
 }
 
-int
-xdg_mime_media_type_equal (const char *mime_a,
-			   const char *mime_b)
-{
-  xdg_mime_init ();
-
-  return _xdg_mime_media_type_equal (mime_a, mime_b);
-}
-
 #if 1
 static int
 xdg_mime_is_super_type (const char *mime)
@@ -742,7 +733,7 @@
 #if 1  
   /* Handle supertypes */
   if (xdg_mime_is_super_type (ubase) &&
-      _xdg_mime_media_type_equal (umime, ubase))
+      xdg_mime_media_type_equal (umime, ubase))
     return 1;
 #endif
 

Modified: branches/glib-2-16/gio/xdgmime/xdgmime.h
==============================================================================
--- branches/glib-2-16/gio/xdgmime/xdgmime.h	(original)
+++ branches/glib-2-16/gio/xdgmime/xdgmime.h	Wed Apr 16 18:16:12 2008
@@ -107,8 +107,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: branches/glib-2-16/gio/xdgmime/xdgmimecache.c
==============================================================================
--- branches/glib-2-16/gio/xdgmime/xdgmimecache.c	(original)
+++ branches/glib-2-16/gio/xdgmime/xdgmimecache.c	Wed Apr 16 18:16:12 2008
@@ -797,7 +797,7 @@
 #if 1
   /* Handle supertypes */
   if (is_super_type (ubase) &&
-      _xdg_mime_media_type_equal (umime, ubase))
+      xdg_mime_media_type_equal (umime, ubase))
     return 1;
 #endif