Commit 8c0c4e1f authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson
Browse files

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
parent f3118e75
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> 2007-12-20 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c: * libnautilus-private/nautilus-file-operations.c:
......
...@@ -133,16 +133,16 @@ nautilus_customization_data_new (const char *customization_name, ...@@ -133,16 +133,16 @@ nautilus_customization_data_new (const char *customization_name,
public_directory_path = get_global_customization_path (customization_name); public_directory_path = get_global_customization_path (customization_name);
public_result = read_all_children (public_directory_path, public_result = read_all_children (public_directory_path,
G_FILE_ATTRIBUTE_STD_NAME "," G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
&data->public_file_list); &data->public_file_list);
g_free (public_directory_path); g_free (public_directory_path);
} }
private_directory_path = get_private_customization_path (customization_name); private_directory_path = get_private_customization_path (customization_name);
private_result = read_all_children (private_directory_path, private_result = read_all_children (private_directory_path,
G_FILE_ATTRIBUTE_STD_NAME "," G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
&data->private_file_list); &data->private_file_list);
g_free (private_directory_path); g_free (private_directory_path);
if (!public_result && !private_result) { if (!public_result && !private_result) {
......
...@@ -1932,7 +1932,7 @@ read_dot_hidden_file (NautilusDirectory *directory) ...@@ -1932,7 +1932,7 @@ read_dot_hidden_file (NautilusDirectory *directory)
type = G_FILE_TYPE_UNKNOWN; 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) { if (info != NULL) {
type = g_file_info_get_file_type (info); type = g_file_info_get_file_type (info);
g_object_unref (info); g_object_unref (info);
...@@ -2539,7 +2539,9 @@ directory_count_start (NautilusDirectory *directory, ...@@ -2539,7 +2539,9 @@ directory_count_start (NautilusDirectory *directory,
location = nautilus_file_get_location (file); location = nautilus_file_get_location (file);
g_file_enumerate_children_async (location, 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 */ 0, /* flags */
G_PRIORITY_DEFAULT, /* prio */ G_PRIORITY_DEFAULT, /* prio */
state->cancellable, state->cancellable,
...@@ -2576,7 +2578,7 @@ deep_count_one (DeepCountState *state, ...@@ -2576,7 +2578,7 @@ deep_count_one (DeepCountState *state,
} }
/* Count the size. */ /* 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); file->details->deep_size += g_file_info_get_size (info);
} }
} }
...@@ -2740,7 +2742,11 @@ deep_count_load (DeepCountState *state, GFile *location) ...@@ -2740,7 +2742,11 @@ deep_count_load (DeepCountState *state, GFile *location)
g_message ("load_directory called to get deep file count for %p", location); g_message ("load_directory called to get deep file count for %p", location);
#endif #endif
g_file_enumerate_children_async (state->deep_count_location, 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 */ 0, /* flags */
G_PRIORITY_LOW, /* prio */ G_PRIORITY_LOW, /* prio */
state->cancellable, state->cancellable,
...@@ -3054,7 +3060,7 @@ mime_list_start (NautilusDirectory *directory, ...@@ -3054,7 +3060,7 @@ mime_list_start (NautilusDirectory *directory,
location = nautilus_file_get_location (file); location = nautilus_file_get_location (file);
g_file_enumerate_children_async (location, g_file_enumerate_children_async (location,
G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, /* flags */ 0, /* flags */
G_PRIORITY_LOW, /* prio */ G_PRIORITY_LOW, /* prio */
state->cancellable, state->cancellable,
......
...@@ -304,28 +304,28 @@ check_same_fs (GFile *file1, GFile *file2) ...@@ -304,28 +304,28 @@ check_same_fs (GFile *file1, GFile *file2)
gboolean res; gboolean res;
info1 = g_file_query_info (file1, info1 = g_file_query_info (file1,
G_FILE_ATTRIBUTE_ID_FS, G_FILE_ATTRIBUTE_ID_FILESYSTEM,
0, NULL, NULL); 0, NULL, NULL);
if (info1 == NULL) { if (info1 == NULL) {
return FALSE; 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) { if (id1 == NULL) {
g_object_unref (info1); g_object_unref (info1);
return FALSE; return FALSE;
} }
info2 = g_file_query_info (file2, info2 = g_file_query_info (file2,
G_FILE_ATTRIBUTE_ID_FS, G_FILE_ATTRIBUTE_ID_FILESYSTEM,
0, NULL, NULL); 0, NULL, NULL);
if (info2 == NULL) { if (info2 == NULL) {
g_object_unref (info1); g_object_unref (info1);
return FALSE; 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) { if (id2 == NULL) {
g_object_unref (info1); g_object_unref (info1);
g_object_unref (info2); g_object_unref (info2);
......
...@@ -607,7 +607,7 @@ custom_basename_to_string (char *format, va_list va) ...@@ -607,7 +607,7 @@ custom_basename_to_string (char *format, va_list va)
file = va_arg (va, GFile *); file = va_arg (va, GFile *);
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STD_DISPLAY_NAME, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
0, 0,
g_cancellable_get_current (), g_cancellable_get_current (),
NULL); NULL);
...@@ -1211,7 +1211,7 @@ delete_dir (CommonJob *job, GFile *dir, ...@@ -1211,7 +1211,7 @@ delete_dir (CommonJob *job, GFile *dir,
retry: retry:
error = NULL; error = NULL;
enumerator = g_file_enumerate_children (dir, enumerator = g_file_enumerate_children (dir,
G_FILE_ATTRIBUTE_STD_NAME, G_FILE_ATTRIBUTE_STANDARD_NAME,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
&error); &error);
...@@ -1778,7 +1778,7 @@ dir_has_files (GFile *dir) ...@@ -1778,7 +1778,7 @@ dir_has_files (GFile *dir)
res = FALSE; res = FALSE;
enumerator = g_file_enumerate_children (dir, enumerator = g_file_enumerate_children (dir,
G_FILE_ATTRIBUTE_STD_NAME, G_FILE_ATTRIBUTE_STANDARD_NAME,
0, 0,
NULL, NULL); NULL, NULL);
if (enumerator) { if (enumerator) {
...@@ -2030,9 +2030,9 @@ scan_dir (GFile *dir, ...@@ -2030,9 +2030,9 @@ scan_dir (GFile *dir,
retry: retry:
error = NULL; error = NULL;
enumerator = g_file_enumerate_children (dir, enumerator = g_file_enumerate_children (dir,
G_FILE_ATTRIBUTE_STD_NAME"," G_FILE_ATTRIBUTE_STANDARD_NAME","
G_FILE_ATTRIBUTE_STD_TYPE"," G_FILE_ATTRIBUTE_STANDARD_TYPE","
G_FILE_ATTRIBUTE_STD_SIZE, G_FILE_ATTRIBUTE_STANDARD_SIZE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
&error); &error);
...@@ -2148,8 +2148,8 @@ scan_file (GFile *file, ...@@ -2148,8 +2148,8 @@ scan_file (GFile *file,
retry: retry:
error = NULL; error = NULL;
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STD_TYPE"," G_FILE_ATTRIBUTE_STANDARD_TYPE","
G_FILE_ATTRIBUTE_STD_SIZE, G_FILE_ATTRIBUTE_STANDARD_SIZE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
&error); &error);
...@@ -2260,8 +2260,8 @@ verify_destination (CommonJob *job, ...@@ -2260,8 +2260,8 @@ verify_destination (CommonJob *job,
error = NULL; error = NULL;
info = g_file_query_info (dest, info = g_file_query_info (dest,
G_FILE_ATTRIBUTE_STD_TYPE"," G_FILE_ATTRIBUTE_STANDARD_TYPE","
G_FILE_ATTRIBUTE_ID_FS, G_FILE_ATTRIBUTE_ID_FILESYSTEM,
0, 0,
job->cancellable, job->cancellable,
&error); &error);
...@@ -2307,7 +2307,7 @@ verify_destination (CommonJob *job, ...@@ -2307,7 +2307,7 @@ verify_destination (CommonJob *job,
if (dest_fs_id) { if (dest_fs_id) {
*dest_fs_id = *dest_fs_id =
g_strdup (g_file_info_get_attribute_string (info, g_strdup (g_file_info_get_attribute_string (info,
G_FILE_ATTRIBUTE_ID_FS)); G_FILE_ATTRIBUTE_ID_FILESYSTEM));
} }
g_object_unref (info); g_object_unref (info);
...@@ -2330,8 +2330,8 @@ verify_destination (CommonJob *job, ...@@ -2330,8 +2330,8 @@ verify_destination (CommonJob *job,
} }
fsinfo = g_file_query_filesystem_info (dest, fsinfo = g_file_query_filesystem_info (dest,
G_FILE_ATTRIBUTE_FS_FREE"," G_FILE_ATTRIBUTE_FILESYSTEM_FREE","
G_FILE_ATTRIBUTE_FS_READONLY, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY,
job->cancellable, job->cancellable,
NULL); NULL);
if (fsinfo == NULL) { if (fsinfo == NULL) {
...@@ -2342,9 +2342,9 @@ verify_destination (CommonJob *job, ...@@ -2342,9 +2342,9 @@ verify_destination (CommonJob *job,
} }
if (required_size > 0 && 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, free_size = g_file_info_get_attribute_uint64 (fsinfo,
G_FILE_ATTRIBUTE_FS_FREE); G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
if (free_size < required_size) { if (free_size < required_size) {
primary = f (_("Error while copying to \"%B\"."), dest); primary = f (_("Error while copying to \"%B\"."), dest);
...@@ -2371,7 +2371,7 @@ verify_destination (CommonJob *job, ...@@ -2371,7 +2371,7 @@ verify_destination (CommonJob *job,
if (!job_aborted (job) && if (!job_aborted (job) &&
g_file_info_get_attribute_boolean (fsinfo, 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); primary = f (_("Error while copying to \"%B\"."), dest);
secondary = f (_("The destination is read-only.")); secondary = f (_("The destination is read-only."));
...@@ -2523,10 +2523,10 @@ get_unique_target_file (GFile *src, ...@@ -2523,10 +2523,10 @@ get_unique_target_file (GFile *src,
dest = NULL; dest = NULL;
info = g_file_query_info (src, info = g_file_query_info (src,
G_FILE_ATTRIBUTE_STD_EDIT_NAME, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
0, NULL, NULL); 0, NULL, NULL);
if (info != 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) { if (editname != NULL) {
new_name = get_duplicate_name (editname, count); new_name = get_duplicate_name (editname, count);
...@@ -2574,10 +2574,10 @@ get_target_file_for_link (GFile *src, ...@@ -2574,10 +2574,10 @@ get_target_file_for_link (GFile *src,
dest = NULL; dest = NULL;
info = g_file_query_info (src, info = g_file_query_info (src,
G_FILE_ATTRIBUTE_STD_EDIT_NAME, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
0, NULL, NULL); 0, NULL, NULL);
if (info != 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) { if (editname != NULL) {
new_name = get_link_name (editname, count); new_name = get_link_name (editname, count);
...@@ -2626,11 +2626,11 @@ get_target_file (GFile *src, ...@@ -2626,11 +2626,11 @@ get_target_file (GFile *src,
dest = NULL; dest = NULL;
if (!same_fs) { if (!same_fs) {
info = g_file_query_info (src, info = g_file_query_info (src,
G_FILE_ATTRIBUTE_STD_COPY_NAME, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME,
0, NULL, NULL); 0, NULL, NULL);
if (info) { 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) { if (copyname) {
dest = g_file_get_child_for_display_name (dest_dir, copyname, NULL); 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) ...@@ -2658,12 +2658,12 @@ has_fs_id (GFile *file, const char *fs_id)
res = FALSE; res = FALSE;
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_ID_FS, G_FILE_ATTRIBUTE_ID_FILESYSTEM,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL, NULL); NULL, NULL);
if (info) { 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) { if (id && strcmp (id, fs_id) == 0) {
res = TRUE; res = TRUE;
...@@ -2683,7 +2683,7 @@ is_dir (GFile *file) ...@@ -2683,7 +2683,7 @@ is_dir (GFile *file)
res = FALSE; res = FALSE;
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STD_TYPE, G_FILE_ATTRIBUTE_STANDARD_TYPE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL, NULL); NULL, NULL);
if (info) { if (info) {
...@@ -2800,7 +2800,7 @@ copy_move_directory (CopyMoveJob *copy_job, ...@@ -2800,7 +2800,7 @@ copy_move_directory (CopyMoveJob *copy_job,
retry: retry:
error = NULL; error = NULL;
enumerator = g_file_enumerate_children (src, enumerator = g_file_enumerate_children (src,
G_FILE_ATTRIBUTE_STD_NAME, G_FILE_ATTRIBUTE_STANDARD_NAME,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
&error); &error);
...@@ -2964,7 +2964,7 @@ remove_target_recursively (CommonJob *job, ...@@ -2964,7 +2964,7 @@ remove_target_recursively (CommonJob *job,
error = NULL; error = NULL;
enumerator = g_file_enumerate_children (file, enumerator = g_file_enumerate_children (file,
G_FILE_ATTRIBUTE_STD_NAME, G_FILE_ATTRIBUTE_STANDARD_NAME,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
&error); &error);
...@@ -4318,7 +4318,7 @@ set_permissions_file (SetPermissionsJob *job, ...@@ -4318,7 +4318,7 @@ set_permissions_file (SetPermissionsJob *job,
if (info == NULL) { if (info == NULL) {
free_info = TRUE; free_info = TRUE;
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STD_TYPE"," G_FILE_ATTRIBUTE_STANDARD_TYPE","
G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_ATTRIBUTE_UNIX_MODE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
common->cancellable, common->cancellable,
...@@ -4351,8 +4351,8 @@ set_permissions_file (SetPermissionsJob *job, ...@@ -4351,8 +4351,8 @@ set_permissions_file (SetPermissionsJob *job,
if (!job_aborted (common) && if (!job_aborted (common) &&
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) { g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
enumerator = g_file_enumerate_children (file, enumerator = g_file_enumerate_children (file,
G_FILE_ATTRIBUTE_STD_NAME"," G_FILE_ATTRIBUTE_STANDARD_NAME","
G_FILE_ATTRIBUTE_STD_TYPE"," G_FILE_ATTRIBUTE_STANDARD_TYPE","
G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_ATTRIBUTE_UNIX_MODE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
common->cancellable, common->cancellable,
...@@ -4832,7 +4832,7 @@ delete_trash_file (CommonJob *job, ...@@ -4832,7 +4832,7 @@ delete_trash_file (CommonJob *job,
} }
enumerator = g_file_enumerate_children (file, enumerator = g_file_enumerate_children (file,
G_FILE_ATTRIBUTE_STD_NAME, G_FILE_ATTRIBUTE_STANDARD_NAME,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
job->cancellable, job->cancellable,
NULL); NULL);
......
...@@ -764,7 +764,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri, ...@@ -764,7 +764,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri,
dir = g_file_new_for_uri (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) { if (info == NULL) {
g_object_unref (dir); g_object_unref (dir);
return NULL; return NULL;
...@@ -778,7 +778,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri, ...@@ -778,7 +778,7 @@ nautilus_ensure_unique_file_name (const char *directory_uri,
g_free (filename); g_free (filename);
copy = 1; 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 (info);
g_object_unref (child); g_object_unref (child);
...@@ -830,7 +830,7 @@ nautilus_find_existing_uri_in_hierarchy (GFile *location) ...@@ -830,7 +830,7 @@ nautilus_find_existing_uri_in_hierarchy (GFile *location)
location = g_object_ref (location); location = g_object_ref (location);
while (location != NULL) { while (location != NULL) {
info = g_file_query_info (location, info = g_file_query_info (location,
"std::name", G_FILE_ATTRIBUTE_STANDARD_NAME,
0, NULL, NULL); 0, NULL, NULL);
g_object_unref (info); g_object_unref (info);
if (info != NULL) { if (info != NULL) {
......
...@@ -1566,7 +1566,7 @@ update_info_internal (NautilusFile *file, ...@@ -1566,7 +1566,7 @@ update_info_internal (NautilusFile *file,
file->details->type = file_type; file->details->type = file_type;
if (!file->details->got_custom_activation_location) { 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 (activation_uri == NULL) {
if (file->details->activation_location) { if (file->details->activation_location) {
g_object_unref (file->details->activation_location); g_object_unref (file->details->activation_location);
...@@ -1706,7 +1706,7 @@ update_info_internal (NautilusFile *file, ...@@ -1706,7 +1706,7 @@ update_info_internal (NautilusFile *file,
file->details->gid = gid; file->details->gid = gid;
size = -1; 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); size = g_file_info_get_size (info);
} }
if (file->details->size != size) { if (file->details->size != size) {
...@@ -5649,10 +5649,10 @@ nautilus_file_get_volume_free_space (NautilusFile *file) ...@@ -5649,10 +5649,10 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
res = NULL; res = NULL;
location = nautilus_file_get_location (file); 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 (info) {
if (g_file_info_has_attribute (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_FS_FREE); free_space = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
res = g_format_size_for_display (free_space); res = g_format_size_for_display (free_space);
} }
g_object_unref (info); g_object_unref (info);
......
...@@ -1138,7 +1138,7 @@ selection_is_image_file (GList *selection_list) ...@@ -1138,7 +1138,7 @@ selection_is_image_file (GList *selection_list)
location = g_file_new_for_uri (selected_item->uri); location = g_file_new_for_uri (selected_item->uri);
info = g_file_query_info (location, info = g_file_query_info (location,
G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, NULL, NULL); 0, NULL, NULL);
if (info) { if (info) {
mime_type = g_file_info_get_content_type (info); mime_type = g_file_info_get_content_type (info);
......
...@@ -68,7 +68,7 @@ is_local_file_a_link (const char *uri) ...@@ -68,7 +68,7 @@ is_local_file_a_link (const char *uri)
file = g_file_new_for_uri (uri); file = g_file_new_for_uri (uri);
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, NULL, &error); 0, NULL, &error);
if (info)