diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-06-08 18:21:03 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:59:36 +0200 |
| commit | ec8f2fca20d36d51d8282281e9f701f855602f14 (patch) | |
| tree | d511cee99f43dcb312d393aff16d926019007710 /client | |
| parent | 54071afd025beb577e67d5ac1f662a5715a76903 (diff) | |
| download | gvfs-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 'client')
| -rw-r--r-- | client/gdaemonfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index 7ae26177..861e7416 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -2334,7 +2334,7 @@ g_daemon_file_set_display_name (GFile *file, res = gvfs_dbus_mount_call_set_display_name_sync (proxy, path, - display_name, + display_name ? display_name : "", &new_path, cancellable, error); @@ -2454,7 +2454,7 @@ g_daemon_file_make_symbolic_link (GFile *file, res = gvfs_dbus_mount_call_make_symbolic_link_sync (proxy, path, - symlink_value, + symlink_value ? symlink_value : "", cancellable, error); g_print ("g_daemon_file_make_symbolic_link: done, res = %d\n", res); @@ -3523,7 +3523,7 @@ set_display_name_async_get_proxy_cb (GVfsDBusMount *proxy, gvfs_dbus_mount_call_set_display_name (proxy, path, - data->display_name, + data->display_name ? data->display_name : "", cancellable, (GAsyncReadyCallback) set_display_name_async_cb, data); |