Update to new file attribute names

2007-12-20  Alexander Larsson  <alexl@redhat.com>

        * client/gvfsfusedaemon.c:
        * daemon/gvfsbackendsftp.c:
        * daemon/gvfsbackendsmb.c:
        * daemon/gvfsbackendsmbbrowse.c:
        * daemon/gvfsbackendtrash.c:
        * daemon/gvfsjobqueryinfo.c:
        * programs/gvfs-copy.c:
        * programs/gvfs-ls.c:
        * programs/gvfs-move.c:
        * test/benchmark-gvfs-big-files.c:
        * test/benchmark-gvfs-small-files.c:
	Update to new file attribute names


svn path=/trunk/; revision=1058

12 files changed, 48 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index a478619a..5f69ea5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2007-12-20  Alexander Larsson  <alexl@redhat.com>
 
+        * client/gvfsfusedaemon.c:
+        * daemon/gvfsbackendsftp.c:
+        * daemon/gvfsbackendsmb.c:
+        * daemon/gvfsbackendsmbbrowse.c:
+        * daemon/gvfsbackendtrash.c:
+        * daemon/gvfsjobqueryinfo.c:
+        * programs/gvfs-copy.c:
+        * programs/gvfs-ls.c:
+        * programs/gvfs-move.c:
+        * test/benchmark-gvfs-big-files.c:
+        * test/benchmark-gvfs-small-files.c:
+	Update to new file attribute names
+
+2007-12-20  Alexander Larsson  <alexl@redhat.com>
+
         * client/gdaemonmount.c:
         * hal/ghaldrive.c:
         * hal/ghalmount.c:
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 2af66b38..308e9494 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -593,10 +593,10 @@ vfs_statfs (const gchar *path, struct statvfs *stbuf)
           stbuf->f_flag = 0;  /* Ignored by FUSE */
           stbuf->f_namemax = 1024;
 
-          if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_FS_SIZE))
-            stbuf->f_blocks = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_FS_SIZE) / 4096;
-          if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_FS_FREE))
-            stbuf->f_bfree = stbuf->f_bavail = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_FS_FREE) / 4096;
+          if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE))
+            stbuf->f_blocks = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE) / 4096;
+          if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE))
+            stbuf->f_bfree = stbuf->f_bavail = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE) / 4096;
         }
       else if (error)
         {
@@ -1359,7 +1359,7 @@ readdir_for_file (GFile *base_file, gpointer buf, fuse_fill_dir_t filler)
 
   g_assert (base_file != NULL);
 
-  enumerator = g_file_enumerate_children (base_file, G_FILE_ATTRIBUTE_STD_NAME, 0, NULL, &error);
+  enumerator = g_file_enumerate_children (base_file, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, &error);
   if (!enumerator)
     {
       gint result;
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 477f1281..4088db34 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -1297,7 +1297,7 @@ parse_attributes (GVfsBackendSftp *backend,
     g_file_info_set_is_hidden (info, TRUE);
 
   if (basename != NULL && basename[strlen (basename) -1] == '~')
-    g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STD_IS_BACKUP, TRUE);
+    g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP, TRUE);
 
   if (flags & SSH_FILEXFER_ATTR_SIZE)
     {
@@ -1371,7 +1371,7 @@ parse_attributes (GVfsBackendSftp *backend,
         }
       
       g_file_info_set_content_type (info, mimetype);
-      g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE, mimetype);
+      g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, mimetype);
       
       if (free_mimetype)
         g_free (mimetype);
@@ -1426,7 +1426,7 @@ parse_attributes (GVfsBackendSftp *backend,
    */
   if (basename != NULL &&
       g_file_attribute_matcher_matches (attribute_matcher,
-                                        G_FILE_ATTRIBUTE_STD_DISPLAY_NAME))
+                                        G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
     {
       char *display_name = g_filename_display_name (basename);
       
@@ -1442,7 +1442,7 @@ parse_attributes (GVfsBackendSftp *backend,
   
   if (basename != NULL &&
       g_file_attribute_matcher_matches (attribute_matcher,
-                                        G_FILE_ATTRIBUTE_STD_EDIT_NAME))
+                                        G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
     {
       char *edit_name = g_filename_display_name (basename);
       g_file_info_set_edit_name (info, edit_name);
@@ -2569,7 +2569,7 @@ read_dir_got_stat_info (GVfsBackendSftp *backend,
   enum_job = G_VFS_JOB_ENUMERATE (job);
 
   if (g_file_attribute_matcher_matches (enum_job->attribute_matcher,
-                                        G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET))
+                                        G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET))
     {
       data->outstanding_requests++;
       command = new_command_stream (backend,
@@ -2965,7 +2965,7 @@ try_query_info (GVfsBackend *backend,
     }
 
   if (g_file_attribute_matcher_matches (job->attribute_matcher,
-                                        G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET))
+                                        G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET))
     {
       data->cb_count++;
       
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
index 99298e0e..14c1fe1d 100644
--- a/daemon/gvfsbackendsmb.c
+++ b/daemon/gvfsbackendsmb.c
@@ -1144,7 +1144,7 @@ set_info_from_stat (GVfsBackendSmb *backend,
 
   if (basename != NULL &&
       g_file_attribute_matcher_matches (matcher,
-                                        G_FILE_ATTRIBUTE_STD_DISPLAY_NAME))
+                                        G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
     {
       if (strcmp (basename, "/") == 0)
 	display_name = g_strdup_printf (_("%s on %s"), backend->share, backend->server);
@@ -1163,7 +1163,7 @@ set_info_from_stat (GVfsBackendSmb *backend,
   
   if (basename != NULL &&
       g_file_attribute_matcher_matches (matcher,
-                                        G_FILE_ATTRIBUTE_STD_EDIT_NAME))
+                                        G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
     {
       char *edit_name = g_filename_display_name (basename);
       g_file_info_set_edit_name (info, edit_name);
@@ -1203,9 +1203,9 @@ set_info_from_stat (GVfsBackendSmb *backend,
 
 
   if (g_file_attribute_matcher_matches (matcher,
-					G_FILE_ATTRIBUTE_STD_CONTENT_TYPE) ||
+					G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE) ||
       g_file_attribute_matcher_matches (matcher,
-					G_FILE_ATTRIBUTE_STD_ICON))
+					G_FILE_ATTRIBUTE_STANDARD_ICON))
     {
       icon = NULL;
       if (S_ISDIR(statbuf->st_mode))
@@ -1351,7 +1351,7 @@ do_query_fs_info (GVfsBackend *backend,
 		  GFileInfo *info,
 		  GFileAttributeMatcher *attribute_matcher)
 {
-  g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FS_TYPE, "cifs");
+  g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, "cifs");
   
   g_vfs_job_succeeded (G_VFS_JOB (job));
 }
@@ -1445,7 +1445,7 @@ do_enumerate (GVfsBackend *backend,
 				       SUB_DELIM_CHARS ":@/");
 
 	      if (matcher == NULL ||
-		  g_file_attribute_matcher_matches_only (matcher, G_FILE_ATTRIBUTE_STD_NAME))
+		  g_file_attribute_matcher_matches_only (matcher, G_FILE_ATTRIBUTE_STANDARD_NAME))
 		{
 		  info = g_file_info_new ();
 		  g_file_info_set_name (info, dirp->name);
diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c
index 79d6362d..8017051e 100644
--- a/daemon/gvfsbackendsmbbrowse.c
+++ b/daemon/gvfsbackendsmbbrowse.c
@@ -927,7 +927,7 @@ get_file_info_from_entry (GVfsBackendSmbBrowse *backend, BrowseEntry *entry, GFi
   g_file_info_set_display_name (info, entry->name_utf8);
   g_file_info_set_edit_name (info, entry->name_utf8);
   g_file_info_set_attribute_string (info, "smb:comment", entry->comment);
-  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STD_IS_VIRTUAL, TRUE);
+  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL, TRUE);
 
   icon = NULL;
   if (entry->smbc_type == SMBC_WORKGROUP)
@@ -992,7 +992,7 @@ get_file_info_from_entry (GVfsBackendSmbBrowse *backend, BrowseEntry *entry, GFi
   else
     g_file_info_set_file_type (info, G_FILE_TYPE_SHORTCUT);
     
-  g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STD_TARGET_URI, uri->str);
+  g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, uri->str);
   g_string_free (uri, TRUE);
 }
 
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 3509ff9a..15d64fed 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -1001,7 +1001,7 @@ enumerate_root_trashdir (GVfsBackend *backend,
   files_file = g_file_get_child (file, "files");
   enumerator =
     g_file_enumerate_children (files_file,
-                               job ? job->attributes : G_FILE_ATTRIBUTE_STD_NAME,
+                               job ? job->attributes : G_FILE_ATTRIBUTE_STANDARD_NAME,
                                job ? job->flags : 0,
                                job ? G_VFS_JOB (job)->cancellable : NULL,
                                NULL);
@@ -1173,7 +1173,7 @@ do_query_info (GVfsBackend *backend,
       g_object_unref (icon);
       
       g_file_info_set_attribute_boolean (info,
-                                         G_FILE_ATTRIBUTE_STD_IS_VIRTUAL,
+                                         G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL,
                                          TRUE);
       g_file_info_set_attribute_boolean (info,
                                          G_FILE_ATTRIBUTE_ACCESS_CAN_READ,
diff --git a/daemon/gvfsjobqueryinfo.c b/daemon/gvfsjobqueryinfo.c
index 71d566d2..40539b9a 100644
--- a/daemon/gvfsjobqueryinfo.c
+++ b/daemon/gvfsjobqueryinfo.c
@@ -180,14 +180,14 @@ create_reply (GVfsJob *job,
   dbus_message_iter_init_append (reply, &iter);
 
   if (g_file_attribute_matcher_matches (op_job->attribute_matcher,
-					G_FILE_ATTRIBUTE_ID_FS))
+					G_FILE_ATTRIBUTE_ID_FILESYSTEM))
     {
       spec = g_vfs_backend_get_mount_spec (op_job->backend);
       if (spec)
 	{
 	  id = g_mount_spec_to_string (spec);
 	  g_file_info_set_attribute_string (op_job->file_info,
-					    G_FILE_ATTRIBUTE_ID_FS,
+					    G_FILE_ATTRIBUTE_ID_FILESYSTEM,
 					    id);
 	  g_free (id);
 	}
diff --git a/programs/gvfs-copy.c b/programs/gvfs-copy.c
index db8bb9fa..fd23ebcc 100644
--- a/programs/gvfs-copy.c
+++ b/programs/gvfs-copy.c
@@ -55,7 +55,7 @@ is_dir (GFile *file)
   GFileInfo *info;
   gboolean res;
   
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
   res = info && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY;
   if (info)
     g_object_unref (info);
diff --git a/programs/gvfs-ls.c b/programs/gvfs-ls.c
index c463d3a7..be202a7b 100644
--- a/programs/gvfs-ls.c
+++ b/programs/gvfs-ls.c
@@ -94,9 +94,9 @@ show_info (GFileInfo *info)
     {
       char *val_as_string;
 
-      if (strcmp (attributes[i], G_FILE_ATTRIBUTE_STD_NAME) == 0 ||
-	  strcmp (attributes[i], G_FILE_ATTRIBUTE_STD_SIZE) == 0 ||
-	  strcmp (attributes[i], G_FILE_ATTRIBUTE_STD_TYPE) == 0)
+      if (strcmp (attributes[i], G_FILE_ATTRIBUTE_STANDARD_NAME) == 0 ||
+	  strcmp (attributes[i], G_FILE_ATTRIBUTE_STANDARD_SIZE) == 0 ||
+	  strcmp (attributes[i], G_FILE_ATTRIBUTE_STANDARD_TYPE) == 0)
 	continue;
 
       if (first_attr)
@@ -175,7 +175,9 @@ main (int argc, char *argv[])
   g_option_context_parse (context, &argc, &argv, &error);
   g_option_context_free (context);
 
-  attributes = g_strconcat (G_FILE_ATTRIBUTE_STD_NAME "," G_FILE_ATTRIBUTE_STD_TYPE "," G_FILE_ATTRIBUTE_STD_SIZE,
+  attributes = g_strconcat (G_FILE_ATTRIBUTE_STANDARD_NAME ","
+			    G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+			    G_FILE_ATTRIBUTE_STANDARD_SIZE,
 			    attributes != NULL ? "," : "",
 			    attributes,
 			    NULL);
diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c
index 9a221603..e39f1d9a 100644
--- a/programs/gvfs-move.c
+++ b/programs/gvfs-move.c
@@ -51,7 +51,7 @@ is_dir (GFile *file)
   GFileInfo *info;
   gboolean res;
   
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
   res = info && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY;
   if (info)
     g_object_unref (info);
diff --git a/test/benchmark-gvfs-big-files.c b/test/benchmark-gvfs-big-files.c
index 4d121a46..777a54bf 100644
--- a/test/benchmark-gvfs-big-files.c
+++ b/test/benchmark-gvfs-big-files.c
@@ -47,7 +47,7 @@ is_dir (GFile *file)
   GFileInfo *info;
   gboolean res;
   
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
   res = info && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY;
   if (info)
     g_object_unref (info);
diff --git a/test/benchmark-gvfs-small-files.c b/test/benchmark-gvfs-small-files.c
index 39d13165..22b34167 100644
--- a/test/benchmark-gvfs-small-files.c
+++ b/test/benchmark-gvfs-small-files.c
@@ -47,7 +47,7 @@ is_dir (GFile *file)
   GFileInfo *info;
   gboolean res;
   
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
   res = info && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY;
   if (info)
     g_object_unref (info);