forked from AuroraMiddleware/gtk
Sync from upstream
Wed Jan 21 09:33:13 2004 Jonathan Blandford <jrb@gnome.org> * libgnomevfs/xdgmimeglob.c: * libgnomevfs/xdgmimemagic.c: Sync from upstream
This commit is contained in:
parent
740082e29d
commit
e935a08d42
@ -1,3 +1,8 @@
|
||||
Wed Jan 21 09:33:13 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* libgnomevfs/xdgmimeglob.c:
|
||||
* libgnomevfs/xdgmimemagic.c: Sync from upstream
|
||||
|
||||
Tue Jan 20 13:07:04 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* xdgmime.c: resync with upstream sources.
|
||||
|
@ -153,7 +153,7 @@ _xdg_glob_hash_node_new (void)
|
||||
return glob_hash_node;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
_xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node,
|
||||
int depth)
|
||||
{
|
||||
@ -341,12 +341,14 @@ _xdg_glob_hash_new (void)
|
||||
static void
|
||||
_xdg_glob_hash_free_nodes (XdgGlobHashNode *node)
|
||||
{
|
||||
|
||||
if (node->child)
|
||||
_xdg_glob_hash_free_nodes (node->child);
|
||||
if (node->next)
|
||||
_xdg_glob_hash_free_nodes (node->next);
|
||||
free (node);
|
||||
if (node)
|
||||
{
|
||||
if (node->child)
|
||||
_xdg_glob_hash_free_nodes (node->child);
|
||||
if (node->next)
|
||||
_xdg_glob_hash_free_nodes (node->next);
|
||||
free (node);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -111,7 +111,7 @@ _xdg_mime_magic_matchlet_new (void)
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
static void
|
||||
_xdg_mime_magic_matchlet_free (XdgMimeMagicMatchlet *mime_magic_matchlet)
|
||||
{
|
||||
if (mime_magic_matchlet)
|
||||
@ -129,7 +129,7 @@ _xdg_mime_magic_matchlet_free (XdgMimeMagicMatchlet *mime_magic_matchlet)
|
||||
|
||||
/* Frees mime_magic_match and the remainder of its list
|
||||
*/
|
||||
void
|
||||
static void
|
||||
_xdg_mime_magic_match_free (XdgMimeMagicMatch *mime_magic_match)
|
||||
{
|
||||
XdgMimeMagicMatch *ptr, *next;
|
||||
@ -614,7 +614,7 @@ _xdg_mime_magic_insert_match (XdgMimeMagic *mime_magic,
|
||||
list = mime_magic->match_list;
|
||||
while (list->next != NULL)
|
||||
{
|
||||
if (list->next->priority > match->priority)
|
||||
if (list->next->priority < match->priority)
|
||||
{
|
||||
match->next = list->next;
|
||||
list->next = match;
|
||||
|
Loading…
Reference in New Issue
Block a user