- commit the fix attempted in 0.11-2 and 0.11-3 to the right function...

This commit is contained in:
Ray Strode 2006-10-27 18:32:38 +00:00
parent 85f5c843bd
commit 5bae86edaa
2 changed files with 22 additions and 9 deletions

View File

@ -1,11 +1,20 @@
--- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal 2006-10-26 10:07:30.000000000 -0400 --- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal 2006-04-18 18:03:13.000000000 -0400
+++ desktop-file-utils-0.11/src/validate.c 2006-10-26 10:07:37.000000000 -0400 +++ desktop-file-utils-0.11/src/validate.c 2006-10-27 14:33:53.000000000 -0400
@@ -285,7 +285,7 @@ @@ -208,7 +208,7 @@
char *valid_onlyshowins; {
if (strcmp (vals[i], categories_keys[j]) != 0)
{
- print_fatal (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n",
+ print_warning (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n",
key, categories_keys[j], vals[i]);
}
break;
@@ -221,7 +221,7 @@
char *valid_categories;
valid_onlyshowins = g_strjoinv ("\", \"", (gchar **) onlyshowin_keys); valid_categories = g_strjoinv ("\", \"", (gchar **) categories_keys);
- print_fatal (filename, "%s values must be one of \"%s\" (found \"%s\")\n", - print_fatal (filename, "%s values must be one of \"%s\" (found \"%s\")\n",
+ print_warning (filename, "%s values must be one of \"%s\" (found \"%s\")\n", + print_warning (filename, "%s values must be one of \"%s\" (found \"%s\")\n",
key, valid_onlyshowins, vals[i]); key, valid_categories, vals[i]);
g_free (valid_onlyshowins); g_free (valid_categories);
} }

View File

@ -1,7 +1,7 @@
Summary: Utilities for manipulating .desktop files Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils Name: desktop-file-utils
Version: 0.11 Version: 0.11
Release: 3%{?dist} Release: 4%{?dist}
URL: http://www.freedesktop.org/software/desktop-file-utils URL: http://www.freedesktop.org/software/desktop-file-utils
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch1: desktop-file-utils-0.10-dont-use-unintialized-memory.patch Patch1: desktop-file-utils-0.10-dont-use-unintialized-memory.patch
@ -57,8 +57,12 @@ update-desktop-database %{_datadir}/applications || :
%{_datadir}/emacs/site-lisp/ %{_datadir}/emacs/site-lisp/
%changelog %changelog
* Fri Oct 27 2006 Ray Strode <rstrode@redhat.com> - 0.11-4
- commit the fix attempted in 0.11-2 and 0.11-3 to the right
function...
* Fri Oct 27 2006 Ray Strode <rstrode@redhat.com> - 0.11-3 * Fri Oct 27 2006 Ray Strode <rstrode@redhat.com> - 0.11-3
- actually apply the patch writte in 0.11-2 - actually apply the patch written in 0.11-2
* Thu Oct 26 2006 Ray Strode <rstrode@redhat.com> - 0.11-2 * Thu Oct 26 2006 Ray Strode <rstrode@redhat.com> - 0.11-2
- make desktop file validation non-fatal until we - make desktop file validation non-fatal until we