Update to new gio file attribute names

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

        * libnautilus-private/nautilus-customization-data.c:
        * libnautilus-private/nautilus-directory-async.c:
        * libnautilus-private/nautilus-dnd.c:
        * libnautilus-private/nautilus-file-operations.c:
        * libnautilus-private/nautilus-file-utilities.c:
        * libnautilus-private/nautilus-file.c:
        * libnautilus-private/nautilus-icon-dnd.c:
        * libnautilus-private/nautilus-link.c:
        * libnautilus-private/nautilus-search-engine-simple.c:
        * libnautilus-private/nautilus-trash-monitor.c:
        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-properties-window.c:
        * src/nautilus-pathbar.c:
        * src/nautilus-property-browser.c:
	Update to new gio file attribute names


svn path=/trunk/; revision=13538

15 files changed, 92 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index 73a42cb29..35376a143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2007-12-20  Alexander Larsson  <alexl@redhat.com>
 
+        * libnautilus-private/nautilus-customization-data.c:
+        * libnautilus-private/nautilus-directory-async.c:
+        * libnautilus-private/nautilus-dnd.c:
+        * libnautilus-private/nautilus-file-operations.c:
+        * libnautilus-private/nautilus-file-utilities.c:
+        * libnautilus-private/nautilus-file.c:
+        * libnautilus-private/nautilus-icon-dnd.c:
+        * libnautilus-private/nautilus-link.c:
+        * libnautilus-private/nautilus-search-engine-simple.c:
+        * libnautilus-private/nautilus-trash-monitor.c:
+        * src/file-manager/fm-directory-view.c:
+        * src/file-manager/fm-properties-window.c:
+        * src/nautilus-pathbar.c:
+        * src/nautilus-property-browser.c:
+	Update to new gio file attribute names
+
+2007-12-20  Alexander Larsson  <alexl@redhat.com>
+
         * libnautilus-private/nautilus-file-operations.c:
         * src/nautilus-places-sidebar.c:
 	Update to new gio api
diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index 29d4d96a5..65c45f790 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -133,16 +133,16 @@ nautilus_customization_data_new (const char *customization_name,
 		public_directory_path = get_global_customization_path (customization_name);
 		
 		public_result  = read_all_children (public_directory_path,
-						    G_FILE_ATTRIBUTE_STD_NAME ","
-						    G_FILE_ATTRIBUTE_STD_CONTENT_TYPE,
+						    G_FILE_ATTRIBUTE_STANDARD_NAME ","
+						    G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 						    &data->public_file_list);
 		g_free (public_directory_path);
 	}
 
 	private_directory_path = get_private_customization_path (customization_name);
 	private_result = read_all_children (private_directory_path,
-					    G_FILE_ATTRIBUTE_STD_NAME ","
-					    G_FILE_ATTRIBUTE_STD_CONTENT_TYPE,
+					    G_FILE_ATTRIBUTE_STANDARD_NAME ","
+					    G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 					    &data->private_file_list);
 	g_free (private_directory_path);
 	if (!public_result && !private_result) {
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 1b5c8a6a6..807310d3a 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -1932,7 +1932,7 @@ read_dot_hidden_file (NautilusDirectory *directory)
 
 	type = G_FILE_TYPE_UNKNOWN;
 	
-	info = g_file_query_info (child, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+	info = g_file_query_info (child, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
 	if (info != NULL) {
 		type = g_file_info_get_file_type (info);
 		g_object_unref (info);
@@ -2539,7 +2539,9 @@ directory_count_start (NautilusDirectory *directory,
 	location = nautilus_file_get_location (file);
 	
 	g_file_enumerate_children_async (location,
-					 "std:name,std:is_hidden,std:is_backup",
+					 G_FILE_ATTRIBUTE_STANDARD_NAME ","
+					 G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+					 G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP,
 					 0, /* flags */
 					 G_PRIORITY_DEFAULT, /* prio */
 					 state->cancellable,
@@ -2576,7 +2578,7 @@ deep_count_one (DeepCountState *state,
 	}
 
 	/* Count the size. */
-	if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STD_SIZE)) {
+	if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE)) {
 		file->details->deep_size += g_file_info_get_size (info);
 	}
 }
@@ -2740,7 +2742,11 @@ deep_count_load (DeepCountState *state, GFile *location)
 	g_message ("load_directory called to get deep file count for %p", location);
 #endif	
 	g_file_enumerate_children_async (state->deep_count_location,
-					 "std:name,std:is_hidden,std:is_backup,std:type,std:size",
+					 G_FILE_ATTRIBUTE_STANDARD_NAME ","
+					 G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+					 G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+					 G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN ","
+					 G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP,
 					 0, /* flags */
 					 G_PRIORITY_LOW, /* prio */
 					 state->cancellable,
@@ -3054,7 +3060,7 @@ mime_list_start (NautilusDirectory *directory,
 	
 	location = nautilus_file_get_location (file);
 	g_file_enumerate_children_async (location,
-					 G_FILE_ATTRIBUTE_STD_CONTENT_TYPE,
+					 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 					 0, /* flags */
 					 G_PRIORITY_LOW, /* prio */
 					 state->cancellable,
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
index 977dd6e5e..1c3d24c6c 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@@ -304,28 +304,28 @@ check_same_fs (GFile *file1, GFile *file2)
 	gboolean res;
 	
 	info1 = g_file_query_info (file1,
-				   G_FILE_ATTRIBUTE_ID_FS,
+				   G_FILE_ATTRIBUTE_ID_FILESYSTEM,
 				   0, NULL, NULL);
 
 	if (info1 == NULL) {
 		return FALSE;
 	}
 
-	id1 = g_file_info_get_attribute_string (info1, G_FILE_ATTRIBUTE_ID_FS);
+	id1 = g_file_info_get_attribute_string (info1, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
 	if (id1 == NULL) {
 		g_object_unref (info1);
 		return FALSE;
 	}
 	
 	info2 = g_file_query_info (file2,
-				   G_FILE_ATTRIBUTE_ID_FS,
+				   G_FILE_ATTRIBUTE_ID_FILESYSTEM,
 				   0, NULL, NULL);
 	if (info2 == NULL) {
 		g_object_unref (info1);
 		return FALSE;
 	}
 
-	id2 = g_file_info_get_attribute_string (info2, G_FILE_ATTRIBUTE_ID_FS);
+	id2 = g_file_info_get_attribute_string (info2, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
 	if (id2 == NULL) {
 		g_object_unref (info1);
 		g_object_unref (info2);
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index bffc65979..b75e70de9 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -607,7 +607,7 @@ custom_basename_to_string (char *format, va_list va)
 	file = va_arg (va, GFile *);
 
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_STD_DISPLAY_NAME,
+				  G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
 				  0,
 				  g_cancellable_get_current (),
 				  NULL);
@@ -1211,7 +1211,7 @@ delete_dir (CommonJob *job, GFile *dir,
  retry:
 	error = NULL;
 	enumerator = g_file_enumerate_children (dir,
-						G_FILE_ATTRIBUTE_STD_NAME,
+						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 						job->cancellable,
 						&error);
@@ -1778,7 +1778,7 @@ dir_has_files (GFile *dir)
 	res = FALSE;
 	
 	enumerator = g_file_enumerate_children (dir,
-						G_FILE_ATTRIBUTE_STD_NAME,
+						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						0,
 						NULL, NULL);
 	if (enumerator) {
@@ -2030,9 +2030,9 @@ scan_dir (GFile *dir,
  retry:
 	error = NULL;
 	enumerator = g_file_enumerate_children (dir,
-						G_FILE_ATTRIBUTE_STD_NAME","
-						G_FILE_ATTRIBUTE_STD_TYPE","
-						G_FILE_ATTRIBUTE_STD_SIZE,
+						G_FILE_ATTRIBUTE_STANDARD_NAME","
+						G_FILE_ATTRIBUTE_STANDARD_TYPE","
+						G_FILE_ATTRIBUTE_STANDARD_SIZE,
 						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 						job->cancellable,
 						&error);
@@ -2148,8 +2148,8 @@ scan_file (GFile *file,
  retry:
 	error = NULL;
 	info = g_file_query_info (file, 
-				  G_FILE_ATTRIBUTE_STD_TYPE","
-				  G_FILE_ATTRIBUTE_STD_SIZE,
+				  G_FILE_ATTRIBUTE_STANDARD_TYPE","
+				  G_FILE_ATTRIBUTE_STANDARD_SIZE,
 				  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 				  job->cancellable,
 				  &error);
@@ -2260,8 +2260,8 @@ verify_destination (CommonJob *job,
 	
 	error = NULL;
 	info = g_file_query_info (dest, 
-				  G_FILE_ATTRIBUTE_STD_TYPE","
-				  G_FILE_ATTRIBUTE_ID_FS,
+				  G_FILE_ATTRIBUTE_STANDARD_TYPE","
+				  G_FILE_ATTRIBUTE_ID_FILESYSTEM,
 				  0,
 				  job->cancellable,
 				  &error);
@@ -2307,7 +2307,7 @@ verify_destination (CommonJob *job,
 	if (dest_fs_id) {
 		*dest_fs_id =
 			g_strdup (g_file_info_get_attribute_string (info,
-								    G_FILE_ATTRIBUTE_ID_FS));
+								    G_FILE_ATTRIBUTE_ID_FILESYSTEM));
 	}
 	
 	g_object_unref (info);
@@ -2330,8 +2330,8 @@ verify_destination (CommonJob *job,
 	}
 	
 	fsinfo = g_file_query_filesystem_info (dest,
-					       G_FILE_ATTRIBUTE_FS_FREE","
-					       G_FILE_ATTRIBUTE_FS_READONLY,
+					       G_FILE_ATTRIBUTE_FILESYSTEM_FREE","
+					       G_FILE_ATTRIBUTE_FILESYSTEM_READONLY,
 					       job->cancellable,
 					       NULL);
 	if (fsinfo == NULL) {
@@ -2342,9 +2342,9 @@ verify_destination (CommonJob *job,
 	}
 	
 	if (required_size > 0 &&
-	    g_file_info_has_attribute (fsinfo, G_FILE_ATTRIBUTE_FS_FREE)) {
+	    g_file_info_has_attribute (fsinfo, G_FILE_ATTRIBUTE_FILESYSTEM_FREE)) {
 		free_size = g_file_info_get_attribute_uint64 (fsinfo,
-							      G_FILE_ATTRIBUTE_FS_FREE);
+							      G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
 		
 		if (free_size < required_size) {
 			primary = f (_("Error while copying to \"%B\"."), dest);
@@ -2371,7 +2371,7 @@ verify_destination (CommonJob *job,
 	
 	if (!job_aborted (job) &&
 	    g_file_info_get_attribute_boolean (fsinfo,
-					       G_FILE_ATTRIBUTE_FS_READONLY)) {
+					       G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) {
 		primary = f (_("Error while copying to \"%B\"."), dest);
 		secondary = f (_("The destination is read-only."));
 
@@ -2523,10 +2523,10 @@ get_unique_target_file (GFile *src,
 	
 	dest = NULL;
 	info = g_file_query_info (src,
-				  G_FILE_ATTRIBUTE_STD_EDIT_NAME,
+				  G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
 				  0, NULL, NULL);
 	if (info != NULL) {
-		editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STD_EDIT_NAME);
+		editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME);
 		
 		if (editname != NULL) {
 			new_name = get_duplicate_name (editname, count);
@@ -2574,10 +2574,10 @@ get_target_file_for_link (GFile *src,
 	
 	dest = NULL;
 	info = g_file_query_info (src,
-				  G_FILE_ATTRIBUTE_STD_EDIT_NAME,
+				  G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
 				  0, NULL, NULL);
 	if (info != NULL) {
-		editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STD_EDIT_NAME);
+		editname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME);
 		
 		if (editname != NULL) {
 			new_name = get_link_name (editname, count);
@@ -2626,11 +2626,11 @@ get_target_file (GFile *src,
 	dest = NULL;
 	if (!same_fs) {
 		info = g_file_query_info (src,
-					  G_FILE_ATTRIBUTE_STD_COPY_NAME,
+					  G_FILE_ATTRIBUTE_STANDARD_COPY_NAME,
 					  0, NULL, NULL);
 		
 		if (info) {
-			copyname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STD_COPY_NAME);
+			copyname = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME);
 
 			if (copyname) {
 				dest = g_file_get_child_for_display_name (dest_dir, copyname, NULL);
@@ -2658,12 +2658,12 @@ has_fs_id (GFile *file, const char *fs_id)
 
 	res = FALSE;
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_ID_FS,
+				  G_FILE_ATTRIBUTE_ID_FILESYSTEM,
 				  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 				  NULL, NULL);
 
 	if (info) {
-		id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FS);
+		id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
 		
 		if (id && strcmp (id, fs_id) == 0) {
 			res = TRUE;
@@ -2683,7 +2683,7 @@ is_dir (GFile *file)
 
 	res = FALSE;
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_STD_TYPE,
+				  G_FILE_ATTRIBUTE_STANDARD_TYPE,
 				  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 				  NULL, NULL);
 	if (info) {
@@ -2800,7 +2800,7 @@ copy_move_directory (CopyMoveJob *copy_job,
  retry:
 	error = NULL;
 	enumerator = g_file_enumerate_children (src,
-						G_FILE_ATTRIBUTE_STD_NAME,
+						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 						job->cancellable,
 						&error);
@@ -2964,7 +2964,7 @@ remove_target_recursively (CommonJob *job,
 	
 	error = NULL;
 	enumerator = g_file_enumerate_children (file,
-						G_FILE_ATTRIBUTE_STD_NAME,
+						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 						job->cancellable,
 						&error);
@@ -4318,7 +4318,7 @@ set_permissions_file (SetPermissionsJob *job,
 	if (info == NULL) {
 		free_info = TRUE;
 		info = g_file_query_info (file,
-					  G_FILE_ATTRIBUTE_STD_TYPE","
+					  G_FILE_ATTRIBUTE_STANDARD_TYPE","
 					  G_FILE_ATTRIBUTE_UNIX_MODE,
 					  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 					  common->cancellable,
@@ -4351,8 +4351,8 @@ set_permissions_file (SetPermissionsJob *job,
 	if (!job_aborted (common) &&
 	    g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
 		enumerator = g_file_enumerate_children (file,
-							G_FILE_ATTRIBUTE_STD_NAME","
-							G_FILE_ATTRIBUTE_STD_TYPE","
+							G_FILE_ATTRIBUTE_STANDARD_NAME","
+							G_FILE_ATTRIBUTE_STANDARD_TYPE","
 							G_FILE_ATTRIBUTE_UNIX_MODE,
 							G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 							common->cancellable,
@@ -4832,7 +4832,7 @@ delete_trash_file (CommonJob *job,
 	}
 	
 	enumerator = g_file_enumerate_children (file,
-						G_FILE_ATTRIBUTE_STD_NAME,
+						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
 						job->cancellable,
 						NULL);
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index d7ddb78cb..6dff02c2f 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -764,7 +764,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri,
 
 	dir = g_file_new_for_uri (directory_uri);
 
-	info = g_file_query_info (dir, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+	info = g_file_query_info (dir, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL);
 	if (info == NULL) {
 		g_object_unref (dir);
 		return NULL;
@@ -778,7 +778,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri,
 	g_free (filename);
 	
 	copy = 1;
-	while ((info = g_file_query_info (child, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL)) != NULL) {
+	while ((info = g_file_query_info (child, G_FILE_ATTRIBUTE_STANDARD_TYPE, 0, NULL, NULL)) != NULL) {
 		g_object_unref (info);
 		g_object_unref (child);
 		
@@ -830,7 +830,7 @@ nautilus_find_existing_uri_in_hierarchy (GFile *location)
 	location = g_object_ref (location);
 	while (location != NULL) {
 		info = g_file_query_info (location,
-					  "std::name",
+					  G_FILE_ATTRIBUTE_STANDARD_NAME,
 					  0, NULL, NULL);
 		g_object_unref (info);
 		if (info != NULL) {
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 0a954158f..f4f25eb78 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -1566,7 +1566,7 @@ update_info_internal (NautilusFile *file,
 	file->details->type = file_type;
 
 	if (!file->details->got_custom_activation_location) {
-		activation_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STD_TARGET_URI);
+		activation_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
 		if (activation_uri == NULL) {
 			if (file->details->activation_location) {
 				g_object_unref (file->details->activation_location);
@@ -1706,7 +1706,7 @@ update_info_internal (NautilusFile *file,
 	file->details->gid = gid;
 	
 	size = -1;
-	if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STD_SIZE)) {
+	if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE)) {
 		size = g_file_info_get_size (info);
 	}
 	if (file->details->size != size) {
@@ -5649,10 +5649,10 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
 	res = NULL;
 
 	location = nautilus_file_get_location (file);
-	info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FS_FREE, NULL, NULL);
+	info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, NULL);
 	if (info) {
-		if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_FS_FREE)) {
-			free_space = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FS_FREE);
+		if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE)) {
+			free_space = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
 			res = g_format_size_for_display (free_space);
 		}
 		g_object_unref (info);
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 08ee37ca3..63ded266d 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -1138,7 +1138,7 @@ selection_is_image_file (GList *selection_list)
 	
 	location = g_file_new_for_uri (selected_item->uri);
 	info = g_file_query_info (location,
-				  G_FILE_ATTRIBUTE_STD_CONTENT_TYPE,
+				  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 				  0, NULL, NULL);
 	if (info) {
 		mime_type = g_file_info_get_content_type (info);
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 0892dd970..d775d01c1 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -68,7 +68,7 @@ is_local_file_a_link (const char *uri)
 	file = g_file_new_for_uri (uri);
 
 	info = g_file_query_info (file,
-				  G_FILE_ATTRIBUTE_STD_CONTENT_TYPE,
+				  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 				  0, NULL, &error);
 	if (info) {
 		link = is_link_mime_type (g_file_info_get_content_type (info));
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 8c91444f3..180070190 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -195,10 +195,10 @@ send_batch (SearchThreadData *data)
 }
 
 #define STD_ATTRIBUTES \
-	G_FILE_ATTRIBUTE_STD_NAME "," \
-	G_FILE_ATTRIBUTE_STD_DISPLAY_NAME "," \
-	G_FILE_ATTRIBUTE_STD_IS_HIDDEN "," \
-	G_FILE_ATTRIBUTE_STD_TYPE "," \
+	G_FILE_ATTRIBUTE_STANDARD_NAME "," \
+	G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "," \
+	G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "," \
+	G_FILE_ATTRIBUTE_STANDARD_TYPE "," \
 	G_FILE_ATTRIBUTE_ID_FILE
 
 static void
@@ -218,7 +218,7 @@ visit_directory (GFile *dir, SearchThreadData *data)
 	enumerator = g_file_enumerate_children (dir,
 						data->mime_types != NULL ?
 						STD_ATTRIBUTES ","
-						G_FILE_ATTRIBUTE_STD_CONTENT_TYPE
+						G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE
 						:
 						STD_ATTRIBUTES
 						,
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 337c7ff9a..808abe231 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -141,7 +141,7 @@ schedule_update_info (NautilusTrashMonitor *trash_monitor)
 	location = g_file_new_for_uri ("trash:///");
 
 	g_file_query_info_async (location,
-				 G_FILE_ATTRIBUTE_STD_ICON,
+				 G_FILE_ATTRIBUTE_STANDARD_ICON,
 				 0, 0, NULL,
 				 update_info_cb, g_object_ref (trash_monitor));
 	
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 7a2c23ed3..d1bf973dc 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -8299,7 +8299,7 @@ fm_directory_view_handle_netscape_url_drop (FMDirectoryView  *view,
 		const char *mime_type;
 
 		f = g_file_new_for_uri (url);
-		info = g_file_query_info (f, G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, 0, NULL, NULL);
+		info = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0, NULL, NULL);
 		mime_type = NULL;
 
 		if (info) {
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index b62465497..1cb38627e 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -2814,10 +2814,10 @@ create_pie_widget (FMPropertiesWindow *window)
 	fstype_label = gtk_label_new (NULL);
 
 	location = g_file_new_for_uri (uri);
-	info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FS_TYPE,
+	info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
 					     NULL, NULL);
 	if (info) {
-		fs_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FS_TYPE);
+		fs_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
 		if (fs_type != NULL) {
 			gtk_label_set_text (GTK_LABEL (fstype_label), g_strconcat (_("Filesystem type: "), fs_type, NULL));
 		}
@@ -2863,11 +2863,11 @@ create_volume_usage_widget (FMPropertiesWindow *window)
 	uri = nautilus_file_get_activation_uri (file);
 
 	location = g_file_new_for_uri (uri);
-	info = g_file_query_filesystem_info (location, "fs:*", NULL, NULL);
+	info = g_file_query_filesystem_info (location, "filesystem::*", NULL, NULL);
 
 	if (info) {
-		window->details->volume_capacity = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FS_SIZE);
-		window->details->volume_free = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FS_FREE);
+		window->details->volume_capacity = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
+		window->details->volume_free = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
 
 		g_object_unref (info);
 	} else {
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index f8058fa43..e4532e414 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1434,7 +1434,7 @@ get_display_name_for_folder (GFile *location)
 	
 	name = NULL;
 	info = g_file_query_info (location,
-				  G_FILE_ATTRIBUTE_STD_DISPLAY_NAME,
+				  G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
 				  0, NULL, NULL);
 	if (info) {
 		name = g_strdup (g_file_info_get_display_name (info));
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 045182f77..0ec225d50 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -718,7 +718,7 @@ ensure_file_is_image (GFile *file)
 	GFileInfo *info;
 	const char *mime_type;
 
-	info = g_file_query_info (file, G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, 0, NULL, NULL);
+	info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0, NULL, NULL);
 	if (info == NULL) {
 		return FALSE;
 	}