AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Partically revert the last commit after realizing that

Browse Source 
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
This commit is contained in:
Matthias Clasen 2008-04-16 17:23:08 +00:00 committed by Matthias Clasen
parent f3177151c6
commit 0d62579c66
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/xdgmime/ChangeLog
View File

@ -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,

13
gtk/xdgmime/xdgmime.c
View File

@ -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)

2
gtk/xdgmime/xdgmime.h
View File

@ -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);

2
gtk/xdgmime/xdgmimecache.c
View File

@ -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