diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2014-03-27 18:04:59 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2014-09-18 13:34:26 +0200 |
| commit | 689dcd35edb55abcdef4d30d92fdcca22d81ee23 (patch) | |
| tree | 3519cd1fd84015f4f0c6162cf0ed7264fa56b783 | |
| parent | 7fc4525dcedb280d22feabcd577ec84e5781960f (diff) | |
| download | vd_agent-689dcd35edb55abcdef4d30d92fdcca22d81ee23.tar.gz vd_agent-689dcd35edb55abcdef4d30d92fdcca22d81ee23.tar.xz vd_agent-689dcd35edb55abcdef4d30d92fdcca22d81ee23.zip | |
Disable file xfer when no suitable destination dir
Currently, if no suitable destination directory can be found, the file
transfer code defaults to using '.' as the destination directory. As this
is unlikely to work, better to just disable file transfers when we end up
in such a situation. This currently happens when spawning spice-vdagent
from gdm where we don't want file transfers to be available anyway.
| -rw-r--r-- | src/vdagent.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/vdagent.c b/src/vdagent.c index b9ad95d..a048d53 100644 --- a/src/vdagent.c +++ b/src/vdagent.c @@ -306,13 +306,14 @@ reconnect: fx_dir = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP); else if (!strcmp(fx_dir, "xdg-download")) fx_dir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD); - if (!fx_dir) { + if (fx_dir) { + vdagent_file_xfers = vdagent_file_xfers_create(client, fx_dir, + fx_open_dir, debug); + } else { syslog(LOG_WARNING, - "warning could not get file xfer save dir, using cwd"); - fx_dir = "."; + "warning could not get file xfer save dir, file transfers will be disabled"); + vdagent_file_xfers = NULL; } - vdagent_file_xfers = vdagent_file_xfers_create(client, fx_dir, - fx_open_dir, debug); if (parent_socket) { if (write(parent_socket, "OK", 2) != 2) |