diff options
| author | Vincent Untz <vuntz@gnome.org> | 2008-01-20 19:33:17 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2008-01-20 19:33:17 +0000 |
| commit | b4fa107d134594bd02cce266be09cd68de0a9d3d (patch) | |
| tree | 88e54ea83ccd386d9b47127c174c32ffe8e8c933 | |
| parent | c6b970d37acd2882adb538e9d1723ed661d0ca94 (diff) | |
don't get the MimeType key from the first start group (which might not
2008-01-20 Vincent Untz <vuntz@gnome.org>
* src/update-desktop-database.c: (process_desktop_file): don't get the
MimeType key from the first start group (which might not exist), but
from the Desktop Entry group
Fix GNOME bug #509526.
* src/validate.c: (handle_icon_key): mention that Ray's change is
temporary
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/update-desktop-database.c | 4 | ||||
| -rw-r--r-- | src/validate.c | 1 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2008-01-20 Vincent Untz <vuntz@gnome.org> + + * src/update-desktop-database.c: (process_desktop_file): don't get the + MimeType key from the first start group (which might not exist), but + from the Desktop Entry group + Fix GNOME bug #509526. + * src/validate.c: (handle_icon_key): mention that Ray's change is + temporary + 2006-11-07 Ray Strode <rstrode@redhat.com> * src/validate.c: Consider icon names with extensions a diff --git a/src/update-desktop-database.c b/src/update-desktop-database.c index 66c6034..4086437 100644 --- a/src/update-desktop-database.c +++ b/src/update-desktop-database.c @@ -33,6 +33,8 @@ #include <glib.h> #include <glib/gi18n.h> +#include "keyfileutils.h" + #define NAME "update-desktop-database" #define CACHE_FILENAME "mimeinfo.cache" #define TEMP_CACHE_FILENAME_PREFIX ".mimeinfo.cache.XXXXXX" @@ -189,7 +191,7 @@ process_desktop_file (const char *desktop_file, } mime_types = g_key_file_get_string_list (keyfile, - g_key_file_get_start_group (keyfile), + GROUP_DESKTOP_ENTRY, "MimeType", NULL, &load_error); g_key_file_free (keyfile); diff --git a/src/validate.c b/src/validate.c index 43a0883..702a78c 100644 --- a/src/validate.c +++ b/src/validate.c @@ -734,6 +734,7 @@ handle_icon_key (kf_validator *kf, return FALSE; } + /* FIXME: in the future, we should make this fatal again */ if (g_str_has_suffix (value, ".png") || g_str_has_suffix (value, ".xpm") || g_str_has_suffix (value, ".svg")) { |