summaryrefslogtreecommitdiff
path: root/daemon/mount.c
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@redhat.com>2012-06-08 18:21:03 +0200
committerTomas Bzatek <tbzatek@redhat.com>2012-07-31 11:59:36 +0200
commitec8f2fca20d36d51d8282281e9f701f855602f14 (patch)
treed511cee99f43dcb312d393aff16d926019007710 /daemon/mount.c
parent54071afd025beb577e67d5ac1f662a5715a76903 (diff)
downloadgvfs-ec8f2fca20d36d51d8282281e9f701f855602f14.tar.gz
gdbus: Treat empty non-NULL strings for the "ay" type as NULL
A fallout of port away from convenient G_DBUS_TYPE_CSTRING type and _g_dbus_message_append_args() + _g_dbus_message_iter_get_args() functions that masked NULL strings as non-NULL empty strings ("") for transferring over d-bus and on the other side reconstructed the original value. Portions of other code treat non-NULL strings differently even if they were empty. This fixes e.g. opening http URLs via gvfs-open.
Diffstat (limited to 'daemon/mount.c')
-rw-r--r--daemon/mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/mount.c b/daemon/mount.c
index 9649f0cf..93d9324e 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -216,7 +216,7 @@ vfs_mount_to_dbus (VfsMount *mount)
mount->user_visible,
(fuse_available && mount->fuse_mountpoint) ? mount->fuse_mountpoint : "",
g_mount_spec_to_dbus (mount->mount_spec),
- mount->default_location);
+ mount->default_location ? mount->default_location : "");
}
static GVariant *