[Spice-devel] [PATCH vdagent 02/11] vdagent: remove fx_dir magic values

[Frediano Ziglio]

> 
> ---
>  src/vdagent/vdagent.c | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)
> 
> diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c
> index dfb9284..6b4c127 100644
> --- a/src/vdagent/vdagent.c
> +++ b/src/vdagent/vdagent.c
> @@ -168,7 +168,7 @@ static void usage(FILE *fp)
>        "  -s <port>                         set virtio serial port\n"
>        "  -S <filename>                     set udcs socket\n"
>        "  -x                                don't daemonize\n"
> -      "  -f <dir|xdg-desktop|xdg-download> file xfer save dir\n"
> +      "  -f <dir>                          file xfer save dir\n"
>        "  -o <0|1>                          open dir on file xfer
>        completion\n",
>        VERSION);
>  }
> @@ -313,18 +313,13 @@ reconnect:
>          return 1;
>      }
>  
> -    if (!fx_dir) {
> -        if (vdagent_x11_has_icons_on_desktop(x11))
> -            fx_dir = "xdg-desktop";
> -        else
> -            fx_dir = "xdg-download";
> -    }
> +    if (!fx_dir)
> +        fx_dir =
> g_get_user_special_dir(vdagent_x11_has_icons_on_desktop(x11) ?
> +                                        G_USER_DIRECTORY_DESKTOP :
> +                                        G_USER_DIRECTORY_DOWNLOAD);
>      if (fx_open_dir == -1)
>          fx_open_dir = !vdagent_x11_has_icons_on_desktop(x11);
> -    if (!strcmp(fx_dir, "xdg-desktop"))
> -        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) {
>          vdagent_file_xfers = vdagent_file_xfers_create(client, fx_dir,
>                                                         fx_open_dir, debug);

This will break updated if some people configured these values.
I think we can have GLib and the current behaviour.

Frediano