diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 14:18:12 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 14:18:12 +0000 |
| commit | f617c59198eba87498ececda27e30721c516354e (patch) | |
| tree | 838c475f88c54fbbfec0cfd171898d38c9a283ac /common/gvfsdaemonprotocol.c | |
| parent | 9fe89f3f10fbfa244e392a8c2ed3faff7b1efa11 (diff) | |
| download | gvfs-f617c59198eba87498ececda27e30721c516354e.tar.gz | |
Add boolean file attribute type
Original git commit by Alexander Larsson <alexl@redhat.com> at 1183715390 +0200
svn path=/trunk/; revision=659
Diffstat (limited to 'common/gvfsdaemonprotocol.c')
| -rw-r--r-- | common/gvfsdaemonprotocol.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/common/gvfsdaemonprotocol.c b/common/gvfsdaemonprotocol.c index dc1f6b21..870ae1ce 100644 --- a/common/gvfsdaemonprotocol.c +++ b/common/gvfsdaemonprotocol.c @@ -22,6 +22,9 @@ _g_dbus_type_from_file_attribute_type (GFileAttributeType type) case G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: dbus_type = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING; break; + case G_FILE_ATTRIBUTE_TYPE_BOOLEAN: + dbus_type = DBUS_TYPE_BOOLEAN_AS_STRING; + break; case G_FILE_ATTRIBUTE_TYPE_UINT32: dbus_type = DBUS_TYPE_UINT32_AS_STRING; break; @@ -175,10 +178,19 @@ _g_dbus_append_file_attribute (DBusMessageIter *iter, if (!dbus_message_iter_close_container (&variant_iter, &obj_struct_iter)) _g_dbus_oom (); } + else if (dbus_type[0] == DBUS_TYPE_BOOLEAN) + { + /* dbus bool is uint32, gboolean is just "int", convert */ + dbus_bool_t bool = value->u.boolean; + if (!dbus_message_iter_append_basic (&variant_iter, + dbus_type[0], &bool)) + _g_dbus_oom (); + } else { + /* All other types have the same size as dbus types */ if (!dbus_message_iter_append_basic (&variant_iter, - dbus_type[0], value)) + dbus_type[0], &value->u)) _g_dbus_oom (); } @@ -246,6 +258,7 @@ _g_dbus_get_file_attribute (DBusMessageIter *iter, DBusMessageIter inner_struct_iter, variant_iter, cstring_iter, obj_iter; const gchar *attribute_temp; dbus_uint32_t obj_type; + dbus_bool_t dbus_bool; g_file_attribute_value_clear (value); @@ -281,6 +294,11 @@ _g_dbus_get_file_attribute (DBusMessageIter *iter, &str, &n_elements); value->u.string = g_strndup (str, n_elements); break; + case DBUS_TYPE_BOOLEAN: + dbus_message_iter_get_basic (&variant_iter, &dbus_bool); + value->u.boolean = dbus_bool; + value->type = G_FILE_ATTRIBUTE_TYPE_BOOLEAN; + break; case DBUS_TYPE_UINT32: dbus_message_iter_get_basic (&variant_iter, &value->u.uint32); value->type = G_FILE_ATTRIBUTE_TYPE_UINT32; |