diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-20 03:20:16 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-20 03:20:16 +0000 |
| commit | ed1f9073fffd397f9bd46403d43dca46f3b3ddc9 (patch) | |
| tree | 581e06bbc98e7bb191a68038b25928c5c17c6916 | |
| parent | bbc45a6230aefa39d2b0aa1abcaf55f88b0473c1 (diff) | |
| download | gtk+-ed1f9073fffd397f9bd46403d43dca46f3b3ddc9.tar.gz | |
fix bug #5241
| -rw-r--r-- | gtk/xdgmime/ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/xdgmime/xdgmimeglob.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index eb37db85e6..f316e4b904 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -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> * === Released 2.10.0 === diff --git a/gtk/xdgmime/xdgmimeglob.c b/gtk/xdgmime/xdgmimeglob.c index 72c19c3521..95d9587ff4 100644 --- a/gtk/xdgmime/xdgmimeglob.c +++ b/gtk/xdgmime/xdgmimeglob.c @@ -308,11 +308,13 @@ _xdg_glob_hash_node_lookup_file_name (XdgGlobHashNode *glob_hash_node, if (*file_name == '\000') { n = 0; - mime_types[n++] = node->mime_type; + if (node->mime_type) + mime_types[n++] = node->mime_type; node = node->child; 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; } } |