shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-06 13:17:45 +03:00
Code Issues Projects Releases Wiki Activity

spice: fix connecting via ssh to a password-protected server

Browse Source 
spice_session_connect() will attempt to connect directly to the
server, we need to continue calling spice_session_open_fd() for ssh
tunnel to work.
This commit is contained in:
Marc-André Lureau 2012-02-29 15:05:59 +01:00
parent 9d7c9000c3
commit 9a322010a3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -17,7 +17,7 @@ GTK2_REQUIRED="2.18.0"
GTK3_REQUIRED="3.0"
GTK_VNC1_REQUIRED="0.3.8"
GTK_VNC2_REQUIRED="0.4.0"
SPICE_GTK_REQUIRED="0.9.11"
SPICE_GTK_REQUIRED="0.10.3"
AC_PROG_CC
AM_PROG_CC_C_O

9
src/virt-viewer-session-spice.c
View File

@ -316,8 +316,15 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
if (ret < 0) {
g_signal_emit_by_name(session, "session-cancelled");
} else {
gboolean openfd;
g_object_set(self->priv->session, "password", password, NULL);
spice_session_connect(self->priv->session);
g_object_get(self->priv->session, "client-sockets", &openfd, NULL);
if (openfd)
spice_session_open_fd(self->priv->session, -1);
else
spice_session_connect(self->priv->session);
}
break;
default:

4
virt-viewer.spec.in
View File

@ -46,9 +46,9 @@ BuildRequires: gtk-vnc-devel >= 0.3.8
%endif
%if %{with_spice}
%if %{with_gtk3}
BuildRequires: spice-gtk3-devel >= 0.9
BuildRequires: spice-gtk3-devel >= 0.10.3
%else
BuildRequires: spice-gtk-devel >= 0.9
BuildRequires: spice-gtk-devel >= 0.10.3
%endif
%endif
BuildRequires: /usr/bin/pod2man