summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2010-03-19 19:21:28 +0100
committerVincent Untz <vuntz@gnome.org>2010-03-19 19:21:28 +0100
commitb145a2c99d21f26809d9e6140bf7e2aa062b6b02 (patch)
tree4cdc062e9060dc74c53cb9a3b0ce2d61a445025c
parent35cfa21227e77a80d8ccf1759ce23565fac3960e (diff)
downloaddesktop-file-utils-b145a2c99d21f26809d9e6140bf7e2aa062b6b02.tar.gz
Make icon names with an extension for Icon key a non-fatal error
We made this a warning to not annoy everybody, but this is really an error. Since we now have a mechanism to handle non-fatal error, use it here.
-rw-r--r--src/validate.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/validate.c b/src/validate.c
index 665ac6c..04bc8d0 100644
--- a/src/validate.c
+++ b/src/validate.c
@@ -904,15 +904,14 @@ 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")) {
- print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
- "name with an extension, but there should be no extension "
- "as described in the Icon Theme Specification if the "
- "value is not an absolute path\n",
- value, locale_key, kf->current_group);
+ print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
+ "name with an extension, but there should be no extension "
+ "as described in the Icon Theme Specification if the "
+ "value is not an absolute path\n",
+ value, locale_key, kf->current_group);
return FALSE;
}