Attachment 82421 Details for Bug 60744 – Allow validating multiple desktop files

Allow validating multiple desktop files

0001-Allow-validating-multiple-desktop-files.patch (text/plain), 2.36 KB, created by Matthias Clasen on 2013-07-14 16:23:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2013-07-14 16:23:41 UTC

Size: 2.36 KB

patch

obsolete

>From c17af2136abc3353a1802564eb4764e4022d91a6 Mon Sep 17 00:00:00 2001
>From: Matthias Clasen <mclasen@redhat.com>
>Date: Sun, 14 Jul 2013 12:18:35 -0400
>Subject: [PATCH] Allow validating multiple desktop files
>
>There is no good reason to not allow this.
>https://bugs.freedesktop.org/show_bug.cgi?id=60744
>---
> src/validator.c | 25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
>diff --git a/src/validator.c b/src/validator.c
>index 20512a6..005fc36 100644
>--- a/src/validator.c
>+++ b/src/validator.c
>@@ -37,7 +37,7 @@ static GOptionEntry option_entries[] = {
>   { "no-hints", 0, 0, G_OPTION_ARG_NONE, &no_hints, "Do not output hints to improve desktop file", NULL },
>   { "no-warn-deprecated", 0, 0, G_OPTION_ARG_NONE, &no_warn_deprecated, "Do not warn about usage of deprecated items", NULL },
>   { "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn about usage of KDE extensions to the specification", NULL },
>-  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>" },
>+  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>..." },
>   { NULL }
> };
> 
>@@ -46,6 +46,8 @@ main (int argc, char *argv[])
> {
>   GOptionContext *context;
>   GError         *error;
>+  int i;
>+  gboolean all_valid;
> 
>   context = g_option_context_new (NULL);
>   g_option_context_set_summary (context, "Validate desktop entry files "
>@@ -66,19 +68,24 @@ main (int argc, char *argv[])
> 
>   g_option_context_free (context);
> 
>-  /* only accept one desktop file argument */
>-  if (filename == NULL || filename[0] == NULL || filename[1] != NULL) {
>+  if (filename == NULL || filename[0] == NULL) {
>     g_printerr ("See \"%s --help\" for correct usage.\n", g_get_prgname ());
>     return 1;
>   }
> 
>-  if (!g_file_test (filename[0], G_FILE_TEST_IS_REGULAR)) {
>-    g_printerr ("%s: file does not exist\n", filename[0]);
>-    return 1;
>+  all_valid = TRUE;
>+  for (i = 0; filename[i]; i++) {
>+    if (!g_file_test (filename[i], G_FILE_TEST_IS_REGULAR)) {
>+      g_printerr ("%s: file does not exist\n", filename[i]);
>+      all_valid = FALSE;
>+    }
>+
>+    if (!desktop_file_validate (filename[i], warn_kde, no_warn_deprecated, no_hints))
>+      all_valid = FALSE;
>   }
> 
>-  if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated, no_hints))
>-    return 0;
>-  else
>+  if (!all_valid)
>     return 1;
>+
>+  return 0;
> }
>-- 
>1.8.3.1
>

Actions: View

Attachments on bug 60744: 82420 | 82421

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.