diff options
| author | Pavel Grunt <pgrunt@redhat.com> | 2015-02-02 17:25:52 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-18 14:07:50 +0100 |
| commit | 45c6fc9b06eab5b51243d4e46e7fd08fb94766c3 (patch) | |
| tree | 5bb1e054d3c810ce5f59dece161f5af0cab3d200 /src/remote-viewer.c | |
| parent | a7d62c285a672bb6ac1e585cf70ffb0bebfb07c1 (diff) | |
| download | virt-viewer-45c6fc9b06eab5b51243d4e46e7fd08fb94766c3.tar.gz virt-viewer-45c6fc9b06eab5b51243d4e46e7fd08fb94766c3.tar.xz virt-viewer-45c6fc9b06eab5b51243d4e46e7fd08fb94766c3.zip | |
Do not add "https://" and "/api" to oVirt URI
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
Diffstat (limited to 'src/remote-viewer.c')
| -rw-r--r-- | src/remote-viewer.c | 5 |
1 files 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); |