|
 |
1efd99 |
From 8f1b485ddf106aae94ccdf14c26ad11a19c471b4 Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
|
|
|
1efd99 |
Date: Fri, 20 Oct 2017 15:00:46 -0200
|
|
|
1efd99 |
Subject: [PATCH] remote-viewer: Pass guri to remote_viewer_session_connected
|
|
|
1efd99 |
|
|
|
1efd99 |
When connecting to a VM via oVirt instance, the original uri can not be
|
|
|
1efd99 |
retrieved using virt_viewer_session_get_uri(). Consequently, it was
|
|
|
1efd99 |
never saved, even though the connection succeeds and the actual callback
|
|
|
1efd99 |
for "session-connected" signal, which saves the URI, is invoked.
|
|
|
1efd99 |
|
|
|
1efd99 |
To solve this problem, we always pass a copy of the guri as user-data
|
|
|
1efd99 |
parameter for the callback, and if the call to
|
|
|
1efd99 |
virt_viewer_session_get_uri() returns NULL, the parameter is used
|
|
|
1efd99 |
instead.
|
|
|
1efd99 |
|
|
|
1efd99 |
Resolves: https://bugzilla.redhat.com/1459792
|
|
|
1efd99 |
|
|
|
1efd99 |
Backport from upstream 6608c0dd60fbf3a762a21a4d039fefc75c040406
|
|
|
1efd99 |
|
|
|
1efd99 |
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/remote-viewer.c | 11 +++++++----
|
|
|
1efd99 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
|
|
|
1efd99 |
index 7834dac..429f38c 100644
|
|
|
1efd99 |
--- a/src/remote-viewer.c
|
|
|
1efd99 |
+++ b/src/remote-viewer.c
|
|
|
1efd99 |
@@ -1064,8 +1064,7 @@ remote_viewer_recent_add(gchar *uri, const gchar *mime_type)
|
|
|
1efd99 |
.mime_type = (char*)mime_type,
|
|
|
1efd99 |
};
|
|
|
1efd99 |
|
|
|
1efd99 |
- if (uri == NULL)
|
|
|
1efd99 |
- return;
|
|
|
1efd99 |
+ g_return_if_fail(uri != NULL);
|
|
|
1efd99 |
|
|
|
1efd99 |
recent = gtk_recent_manager_get_default();
|
|
|
1efd99 |
meta.display_name = uri;
|
|
|
1efd99 |
@@ -1075,13 +1074,17 @@ remote_viewer_recent_add(gchar *uri, const gchar *mime_type)
|
|
|
1efd99 |
|
|
|
1efd99 |
static void
|
|
|
1efd99 |
remote_viewer_session_connected(VirtViewerSession *session,
|
|
|
1efd99 |
- VirtViewerApp *self G_GNUC_UNUSED)
|
|
|
1efd99 |
+ gchar *guri)
|
|
|
1efd99 |
{
|
|
|
1efd99 |
gchar *uri = virt_viewer_session_get_uri(session);
|
|
|
1efd99 |
const gchar *mime = virt_viewer_session_mime_type(session);
|
|
|
1efd99 |
|
|
|
1efd99 |
+ if (uri == NULL)
|
|
|
1efd99 |
+ uri = g_strdup(guri);
|
|
|
1efd99 |
+
|
|
|
1efd99 |
remote_viewer_recent_add(uri, mime);
|
|
|
1efd99 |
g_free(uri);
|
|
|
1efd99 |
+ g_free(guri);
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
static gboolean
|
|
|
1efd99 |
@@ -1169,7 +1172,7 @@ retry_dialog:
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
g_signal_connect(virt_viewer_app_get_session(app), "session-connected",
|
|
|
1efd99 |
- G_CALLBACK(remote_viewer_session_connected), app);
|
|
|
1efd99 |
+ G_CALLBACK(remote_viewer_session_connected), g_strdup(guri));
|
|
|
1efd99 |
|
|
|
1efd99 |
virt_viewer_session_set_file(virt_viewer_app_get_session(app), vvfile);
|
|
|
1efd99 |
#ifdef HAVE_OVIRT
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.13.6
|
|
|
1efd99 |
|