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

fix bug #5241

Browse Source
This commit is contained in:
Matthias Clasen 2006-07-20 03:20:16 +00:00
parent bbc45a6230
commit ed1f9073ff
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/xdgmime/ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-19 Matthias Clasen <mclasen@redhat.com>
* xdgmimeglob.c (_xdg_glob_hash_node_lookup_file_name):
Don't return NULL as a mimetype, ever, patch
by Yevgen Muntyan, bugs.freedesktop.org #5241
2006-07-02 Matthias Clasen <mclasen@redhat.com> 2006-07-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.10.0 === * === Released 2.10.0 ===

6
gtk/xdgmime/xdgmimeglob.c
View File

@ -308,11 +308,13 @@ _xdg_glob_hash_node_lookup_file_name (XdgGlobHashNode *glob_hash_node,
if (*file_name == '\000') if (*file_name == '\000')
{ {
n = 0; n = 0;
mime_types[n++] = node->mime_type; if (node->mime_type)
mime_types[n++] = node->mime_type;
node = node->child; node = node->child;
while (n < n_mime_types && node && node->character == 0) while (n < n_mime_types && node && node->character == 0)
{ {
mime_types[n++] = node->mime_type; if (node->mime_type)
mime_types[n++] = node->mime_type;
node = node->next; node = node->next;
} }
} }