mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-26 15:36:14 +01:00
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=6857
This commit is contained in:
parent
101521f6e4
commit
07ad3555ed
@ -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/xdgmime.h:
|
||||
* xdgmime/xdgmime.c: Get rid of _xdg_mime_media_type_equal
|
||||
|
||||
* xdgmime/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,
|
||||
|
@ -684,7 +684,7 @@ xdg_mime_mime_type_equal (const char *mime_a,
|
||||
}
|
||||
|
||||
int
|
||||
_xdg_mime_media_type_equal (const char *mime_a,
|
||||
xdg_mime_media_type_equal (const char *mime_a,
|
||||
const char *mime_b)
|
||||
{
|
||||
char *sep;
|
||||
@ -697,15 +697,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)
|
||||
|
@ -107,8 +107,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);
|
||||
const char *_xdg_mime_unalias_mime_type (const char *mime);
|
||||
|
@ -797,7 +797,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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user