gtk+ r20012 - branches/gtk-2-12/gtk/xdgmime

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Apr 16 18:26:01 2008
New Revision: 20012
URL: http://svn.gnome.org/viewvc/gtk+?rev=20012&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.h:
        * xdgmime.c: Get rid of _xdg_mime_media_type_equal

        * xdgmimecache.c: Use xdg_mime_media_type_equal



Modified:
   branches/gtk-2-12/gtk/xdgmime/ChangeLog
   branches/gtk-2-12/gtk/xdgmime/xdgmime.c
   branches/gtk-2-12/gtk/xdgmime/xdgmime.h
   branches/gtk-2-12/gtk/xdgmime/xdgmimecache.c

Modified: branches/gtk-2-12/gtk/xdgmime/xdgmime.c
==============================================================================
--- branches/gtk-2-12/gtk/xdgmime/xdgmime.c	(original)
+++ branches/gtk-2-12/gtk/xdgmime/xdgmime.c	Wed Apr 16 18:26:01 2008
@@ -670,8 +670,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;
 
@@ -683,15 +683,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)

Modified: branches/gtk-2-12/gtk/xdgmime/xdgmime.h
==============================================================================
--- branches/gtk-2-12/gtk/xdgmime/xdgmime.h	(original)
+++ branches/gtk-2-12/gtk/xdgmime/xdgmime.h	Wed Apr 16 18:26:01 2008
@@ -99,8 +99,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);
 

Modified: branches/gtk-2-12/gtk/xdgmime/xdgmimecache.c
==============================================================================
--- branches/gtk-2-12/gtk/xdgmime/xdgmimecache.c	(original)
+++ branches/gtk-2-12/gtk/xdgmime/xdgmimecache.c	Wed Apr 16 18:26:01 2008
@@ -783,7 +783,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