[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / tests / gio-ls.c

diff --git a/tests/gio-ls.c b/tests/gio-ls.c
index deab59b..9ae74d4 100644 (file)
--- a/tests/gio-ls.c
+++ b/tests/gio-ls.c
@@ -1,5 +1,4 @@
 
-#include <glib/goption.h>
 #include <gio/gio.h>
 
 #define GETTEXT_PACKAGE "gio-ls"
@@ -33,8 +32,6 @@ main (int argc, char *argv[])
   GError *error = NULL;
   int i;
 
-  g_type_init ();
-
   context = g_option_context_new(_("[FILE...]"));
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
   
@@ -61,7 +58,7 @@ print_path (const gchar* path,
             guint32      flags)
 {
   GFile *top;
-  const gchar *short_attrs = G_FILE_ATTRIBUTE_STD_NAME;
+  const gchar *short_attrs = G_FILE_ATTRIBUTE_STANDARD_NAME;
   const gchar *long_attrs = G_FILE_ATTRIBUTE_OWNER_USER "," G_FILE_ATTRIBUTE_OWNER_GROUP "," \
                            "access:*,std:*";
   const gchar *attrs;
@@ -92,7 +89,7 @@ print_path (const gchar* path,
 
           if (flags & SHOW_LONG)
            {
-             GFileAttributeValue *val = g_file_info_get_attribute (info, G_FILE_ATTRIBUTE_OWNER_USER);
+             const gchar *val;
              
              g_print ("%c%c%c%c ",
                g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY ? 'd' : '-',
@@ -100,19 +97,14 @@ print_path (const gchar* path,
                g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) ? 'w' : '-',
                g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE) ? 'x' : '-');
 
-             if (!val)
-               g_print ("\t?");
-              else if (val->type == G_FILE_ATTRIBUTE_TYPE_STRING)
-               g_print ("\t%15s", val->u.string);
+             val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_USER);
+             g_print ("\t%15s", val ? val : "?user?");
 
-             val = g_file_info_get_attribute (info, G_FILE_ATTRIBUTE_OWNER_GROUP);
-             if (!val)
-               g_print ("\t?");
-              else if (val->type == G_FILE_ATTRIBUTE_TYPE_STRING)
-               g_print ("\t%15s", val->u.string);
+             val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_GROUP);
+             g_print ("\t%15s", val ? val : "?group?");
            }
            
-         g_print ("\t%s\n", name ? name : "<NULL>");
+         g_print ("\t%s\n", name ? name : "?noname?");
 
          g_object_unref (info);
        }