commit 7dac406b203270990ddabab12699415c88b2df01
author Benjamin Otte <otte@redhat.com> Mon Sep 30 15:53:49 2019 +0200
committer Benjamin Otte <otte@redhat.com> Mon Sep 30 16:04:30 2019 +0200
tree 2d246b5700c66cebba4c56045bb513a4dda26d95
parent c27be686e6af76192c561182bf089b74478ba965

gio-tool: Respect --attributes

Do not add custom attributes when the command-line explicitly specifies
some.

gio/gio-tool-list.c

diff --git a/gio/gio-tool-list.c b/gio/gio-tool-list.c
index d1501b8..ce4cbf3 100644
--- a/gio/gio-tool-list.c
+++ b/gio/gio-tool-list.c
@@ -192,16 +192,18 @@
 
   g_option_context_free (context);
 
-  if (attributes != NULL)
-    show_long = TRUE;
-
-  attributes = g_strconcat (G_FILE_ATTRIBUTE_STANDARD_NAME ","
-                            G_FILE_ATTRIBUTE_STANDARD_TYPE ","
-                            G_FILE_ATTRIBUTE_STANDARD_SIZE ","
-                            G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
-                            attributes != NULL ? "," : "",
-                            attributes,
-                            NULL);
+  if (attributes == NULL)
+    {
+      attributes = g_strconcat (G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+                                G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+                                NULL);
+    }
+  else
+    {
+      show_long = TRUE;
+    }
 
   res = TRUE;
   if (argc > 1)