Partically revert the last commit after realizing that

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

svn path=/trunk/; revision=20011

diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
index d1c2775ac84f1837aa6e65d5e343b742aaf3b27e..bd59c940c9210b1b0bd2c84ee6bc31a172ad494b 100644 (file)
--- a/gtk/xdgmime/ChangeLog
+++ b/gtk/xdgmime/ChangeLog
@@ -1,3 +1,13 @@
+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.h:
+       * xdgmime.c: Get rid of _xdg_mime_media_type_equal
+
+       * xdgmimecache.c: Use xdg_mime_media_type_equal
+
 2008-04-16  Matthias Clasen  <mclasen@redhat.com>
 
        Avoid possible memory corruption in xdgmime, fd.o bug 12512,

diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c
index d344b586da343cb58677bf9704fe228e615740c6..7ca7d6e431823b69cc5be2359b96212f9c62c144 100644 (file)
--- a/gtk/xdgmime/xdgmime.c
+++ b/gtk/xdgmime/xdgmime.c
@@ -670,8 +670,8 @@ xdg_mime_mime_type_equal (const char *mime_a,
 }
 
 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;
 
@@ -683,15 +683,6 @@ _xdg_mime_media_type_equal (const char *mime_a,
   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)

diff --git a/gtk/xdgmime/xdgmime.h b/gtk/xdgmime/xdgmime.h
index d8172be25b214fe912ddf6c6adbe498e4abe88f0..a4b0997293c5d75130cc27fef31fc87be11b53cf 100644 (file)
--- a/gtk/xdgmime/xdgmime.h
+++ b/gtk/xdgmime/xdgmime.h
@@ -99,8 +99,6 @@ void         xdg_mime_remove_callback              (int              callback_id
    /* 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);
 

diff --git a/gtk/xdgmime/xdgmimecache.c b/gtk/xdgmime/xdgmimecache.c
index e4773133d8893326fea790ec335865829c8d40ec..8717214fad27b4011132a28c13627f519378b879 100644 (file)
--- a/gtk/xdgmime/xdgmimecache.c
+++ b/gtk/xdgmime/xdgmimecache.c
@@ -783,7 +783,7 @@ _xdg_mime_cache_mime_type_subclass (const char *mime,
 #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