[virt-tools-list] [PATCH virt-viewer] Do not add "https://" and "/api" to oVirt URI

[Marc-André Lureau]

----- Original Message -----
> It is deprecated since govirt 0.3.1

and vv already depends on >= 0.3.2

so ack

> 
> Silences:
> (remote-viewer:19420): libgovirt-WARNING **: Passing a full http:// or
> https:// URI to ovirt_proxy_new() is deprecated
> (remote-viewer:19420): libgovirt-WARNING **: Passing an URI ending in /api to
> ovirt_proxy_new() is deprecated

(that looks like a useless deprecation and backward breakage to me)

> ---
>  src/remote-viewer.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/remote-viewer.c b/src/remote-viewer.c
> index a7122bc..4c97a12 100644
> --- a/src/remote-viewer.c
> +++ b/src/remote-viewer.c
> @@ -668,7 +668,7 @@ parse_ovirt_uri(const gchar *uri_str, char **rest_uri,
> char **name, char **usern
>  
>      if (uri->path == NULL) {
>          *name = NULL;
> -        *rest_uri = g_strdup_printf("https://%s/api/", uri->server);
> +        *rest_uri = g_strdup(uri->server);
>          xmlFreeURI(uri);
>          return TRUE;
>      }
> @@ -691,8 +691,7 @@ parse_ovirt_uri(const gchar *uri_str, char **rest_uri,
> char **name, char **usern
>  
>      /* build final URI */
>      rel_path = g_strjoinv("/", path_elements);
> -    /* FIXME: how to decide between http and https? */
> -    *rest_uri = g_strdup_printf("https://%s%s/api/", uri->server, rel_path);
> +    *rest_uri = g_strdup_printf("%s%s", uri->server, rel_path);
>      *name = vm_name;
>      g_free(rel_path);
>      g_strfreev(path_elements);
> --
> 1.9.3
> 
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
>