diff options
author | Matthias Clasen <mclasen@redhat.com> | 2007-01-08 04:23:19 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-08 04:23:19 +0000 |
commit | e232d48a0e56b1a9335c9e6943c30698ba9d8781 (patch) | |
tree | 7c22f0318f27a00813ddf73ac6788feb35e4653a | |
parent | 1dda45b32b84127acf96b8f22985560ae7881eb8 (diff) | |
download | gdk-pixbuf-e232d48a0e56b1a9335c9e6943c30698ba9d8781.tar.gz |
Don't return "" as match. (fd.o #9544, Yevgen Muntyan)
2007-01-07 Matthias Clasen <mclasen@redhat.com>
* xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return ""
as match. (fd.o #9544, Yevgen Muntyan)
svn path=/branches/gtk-2-10/; revision=17113
-rw-r--r-- | gtk/xdgmime/ChangeLog | 7 | ||||
-rw-r--r-- | gtk/xdgmime/xdgmimecache.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index 59b109f8a..66c327cbb 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -1,6 +1,11 @@ 2007-01-07 Matthias Clasen <mclasen@redhat.com> - * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix + * xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return "" + as match. (fd.o #9544, Yevgen Muntyan) + +2007-01-07 Matthias Clasen <mclasen@redhat.com> + + * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix several problems with this function. (fd.o #9560, Yevgen Muntyan) 2007-01-05 Matthias Clasen <mclasen@redhat.com> diff --git a/gtk/xdgmime/xdgmimecache.c b/gtk/xdgmime/xdgmimecache.c index a8035798d..8804eab51 100644 --- a/gtk/xdgmime/xdgmimecache.c +++ b/gtk/xdgmime/xdgmimecache.c @@ -463,7 +463,8 @@ cache_glob_node_lookup_suffix (XdgMimeCache *cache, { mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 4); n = 0; - mime_types[n++] = cache->buffer + mimetype_offset; + if (mimetype_offset) + mime_types[n++] = cache->buffer + mimetype_offset; n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8); child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12); |