diff options
Diffstat (limited to 'daemon/gvfsjobgetinfo.c')
| -rw-r--r-- | daemon/gvfsjobgetinfo.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/daemon/gvfsjobgetinfo.c b/daemon/gvfsjobgetinfo.c index 57db3cce..64aae474 100644 --- a/daemon/gvfsjobgetinfo.c +++ b/daemon/gvfsjobgetinfo.c @@ -65,17 +65,15 @@ g_vfs_job_get_info_new (DBusConnection *connection, DBusError derror; int path_len; const char *path_data; - guint32 requested; char *attributes; - dbus_bool_t follow_symlinks; + dbus_uint32_t flags; dbus_error_init (&derror); if (!dbus_message_get_args (message, &derror, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &path_data, &path_len, - DBUS_TYPE_UINT32, &requested, DBUS_TYPE_STRING, &attributes, - DBUS_TYPE_BOOLEAN, &follow_symlinks, + DBUS_TYPE_UINT32, &flags, 0)) { reply = dbus_message_new_error (message, @@ -94,9 +92,8 @@ g_vfs_job_get_info_new (DBusConnection *connection, job->filename = g_strndup (path_data, path_len); job->backend = backend; - job->requested = requested; job->attributes = g_strdup (attributes); - job->follow_symlinks = follow_symlinks; + job->flags = flags; return G_VFS_JOB (job); } @@ -110,9 +107,8 @@ run (GVfsJob *job) class->get_info (op_job->backend, op_job, op_job->filename, - op_job->requested, op_job->attributes, - op_job->follow_symlinks); + op_job->flags); } static gboolean @@ -127,17 +123,14 @@ try (GVfsJob *job) return class->try_get_info (op_job->backend, op_job, op_job->filename, - op_job->requested, op_job->attributes, - op_job->follow_symlinks); + op_job->flags); } void g_vfs_job_get_info_set_info (GVfsJobGetInfo *job, - GFileInfoRequestFlags requested_result, GFileInfo *file_info) { - job->requested_result = requested_result; job->file_info = g_object_ref (file_info); } @@ -150,20 +143,12 @@ create_reply (GVfsJob *job, GVfsJobGetInfo *op_job = G_VFS_JOB_GET_INFO (job); DBusMessage *reply; DBusMessageIter iter; - guint32 requested_32; reply = dbus_message_new_method_return (message); dbus_message_iter_init_append (reply, &iter); - requested_32 = op_job->requested_result; - if (!dbus_message_iter_append_basic (&iter, - DBUS_TYPE_UINT32, - &requested_32)) - _g_dbus_oom (); - g_dbus_append_file_info (&iter, - op_job->requested_result, op_job->file_info); return reply; |