diff options
| author | Christian Neumair <cneumair@gnome.org> | 2005-12-01 21:44:42 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@gnome.org> | 2005-12-01 21:44:42 +0000 |
| commit | 994a94dae11985619067b121c7a262db3a439dbf (patch) | |
| tree | 299d81478e9569dd824c72b9658b7ebe4e76c9da | |
| parent | dd956022213fe5f8195c9e3bbf5f568289b5f7cb (diff) | |
2005-12-01 Christian Neumair <chris@gnome-de.org>
* src/xdgmime.c: (xdg_mime_get_mime_type_from_file_name):
* src/xdgmimecache.c: (_xdg_mime_cache_get_mime_type_from_file_name):
Return XDG_MIME_TYPE_UNKNOWN if multiple MIME types match a simple
pattern.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/xdgmime.c | 6 | ||||
| -rw-r--r-- | src/xdgmimecache.c | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2005-12-01 Christian Neumair <chris@gnome-de.org> + + * src/xdgmime.c: (xdg_mime_get_mime_type_from_file_name): + * src/xdgmimecache.c: (_xdg_mime_cache_get_mime_type_from_file_name): + Return XDG_MIME_TYPE_UNKNOWN if multiple MIME types match a simple + pattern. + 2005-12-01 Matthias Clasen <mclasen@redhat.com> * src/xdgmimecache.h: diff --git a/src/xdgmime.c b/src/xdgmime.c index 66cdbb5..54a89aa 100644 --- a/src/xdgmime.c +++ b/src/xdgmime.c @@ -528,15 +528,15 @@ xdg_mime_get_mime_type_for_file (const char *file_name, const char * xdg_mime_get_mime_type_from_file_name (const char *file_name) { - const char *mime_type; + const char *mime_types[2]; xdg_mime_init (); if (_caches) return _xdg_mime_cache_get_mime_type_from_file_name (file_name); - if (_xdg_glob_hash_lookup_file_name (global_hash, file_name, &mime_type, 1)) - return mime_type; + if (_xdg_glob_hash_lookup_file_name (global_hash, file_name, mime_types, 2) == 1) + return mime_types[0]; else return XDG_MIME_TYPE_UNKNOWN; } diff --git a/src/xdgmimecache.c b/src/xdgmimecache.c index d08c89b..ee3ba6a 100644 --- a/src/xdgmimecache.c +++ b/src/xdgmimecache.c @@ -737,10 +737,10 @@ _xdg_mime_cache_get_mime_type_for_file (const char *file_name, const char * _xdg_mime_cache_get_mime_type_from_file_name (const char *file_name) { - const char *mime_type; + const char *mime_types[2]; - if (cache_glob_lookup_file_name (file_name, &mime_type, 1)) - return mime_type; + if (cache_glob_lookup_file_name (file_name, mime_types, 2) == 1) + return mime_types[0]; else return XDG_MIME_TYPE_UNKNOWN; } |