pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-29 00:15:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not add "https://" and "/api" to oVirt URI

Browse Source 
It is deprecated since govirt 0.3.1 (and virt-viewer already depends on
govirt 0.3.2).

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
This commit is contained in:
Pavel Grunt 2015-02-02 17:25:52 +01:00 committed by Fabiano Fidêncio
parent a7d62c285a
commit 45c6fc9b06
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/remote-viewer.c
View File

@ -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);