Hello community,
here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2014-03-09 20:28:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old)
and /work/SRC/openSUSE:Factory/.virt-viewer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-viewer"
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2014-01-29 22:23:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2014-03-09 20:28:17.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Feb 27 08:29:31 MST 2014 - carnold@suse.com
+
+- Upstream bug fixes
+ 52fa6455-display-warning-if-UI-file-fails.patch
+ 52fce019-dont-free-session-if-auth-retry.patch
+ 52fce019-dont-hide-main-window-when-disconnecting.patch
+ 52fce019-set-VNC-display-ready-after-VNC-initialized.patch
+ 530b1cfc-german-translation-send-key-fix.patch
+
+-------------------------------------------------------------------
New:
----
52fa6455-display-warning-if-UI-file-fails.patch
52fce019-dont-free-session-if-auth-retry.patch
52fce019-dont-hide-main-window-when-disconnecting.patch
52fce019-set-VNC-display-ready-after-VNC-initialized.patch
530b1cfc-german-translation-send-key-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-viewer.spec ++++++
--- /var/tmp/diff_new_pack.27eci7/_old 2014-03-09 20:28:18.000000000 +0100
+++ /var/tmp/diff_new_pack.27eci7/_new 2014-03-09 20:28:18.000000000 +0100
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: virt-viewer
Summary: Virtual Machine Viewer
License: GPL-2.0+
@@ -24,6 +23,11 @@
Release: 0
Url: http://www.virt-manager.org
Source0: virt-viewer-0.6.0.tar.bz2
+Patch1: 52fa6455-display-warning-if-UI-file-fails.patch
+Patch2: 52fce019-dont-free-session-if-auth-retry.patch
+Patch3: 52fce019-dont-hide-main-window-when-disconnecting.patch
+Patch4: 52fce019-set-VNC-display-ready-after-VNC-initialized.patch
+Patch5: 530b1cfc-german-translation-send-key-fix.patch
Patch20: netcat.patch
Patch21: windows-keycombo.patch
Patch22: netware-keycombo.patch
@@ -62,6 +66,11 @@
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
++++++ 52fa6455-display-warning-if-UI-file-fails.patch ++++++
Subject: Display warning if UI file fails
From: Jonathon Jongsma jjongsma@redhat.com Mon Jan 20 10:28:40 2014 -0600
Date: Tue Feb 11 11:56:37 2014 -0600:
Git: bee13a6a59e44a9184f8c548207f0bddf8845d2e
When trying to load ui files, we try to find the file in several directories.
If a file is not found in one directory, try to load it from the next directory.
However, if a file is found in a directory but we are not able to load it (e.g.
due to unsupported versions of glade used to generate it, etc), we should print
a warning to the terminal to help the developer debug the issue.
This is an unexpected failure (whereas not finding the file in that directory at
all is an 'expected' failure).
diff --git a/src/virt-viewer-util.c b/src/virt-viewer-util.c
index 9deddad..4c60583 100644
--- a/src/virt-viewer-util.c
+++ b/src/virt-viewer-util.c
@@ -58,7 +58,12 @@ GtkBuilder *virt_viewer_util_load_ui(const char *name)
gtk_builder_add_from_file(builder, name, &error);
} else {
gchar *path = g_build_filename(PACKAGE_DATADIR, "ui", name, NULL);
- gboolean success = (gtk_builder_add_from_file(builder, path, NULL) != 0);
+ gboolean success = (gtk_builder_add_from_file(builder, path, &error) != 0);
+ if (error) {
+ if (!(error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_NOENT))
+ g_warning("Failed to add ui file '%s': %s", path, error->message);
+ g_clear_error(&error);
+ }
g_free(path);
if (!success) {
++++++ 52fce019-dont-free-session-if-auth-retry.patch ++++++
Subject: rhbz#1007306 - Don't free session if we're re-trying auth
From: Jonathon Jongsma jjongsma@redhat.com Fri Jan 31 13:56:19 2014 -0600
Date: Thu Feb 13 09:09:13 2014 -0600:
Git: 74b532f1ecf5affecc13e322723881ba42d2dd29
deactivate() is called in response to a failed authentication attempt. If the
session is cleared here, when a user attempts to re-authenticate, it will issue
a warning and will not actually work. So only clear the session here if we're
not going to re-try authentication.
Index: virt-viewer-0.6.0/src/virt-viewer-app.c
===================================================================
--- virt-viewer-0.6.0.orig/src/virt-viewer-app.c
+++ virt-viewer-0.6.0/src/virt-viewer-app.c
@@ -1249,7 +1249,6 @@ virt_viewer_app_deactivate(VirtViewerApp
if (priv->session) {
virt_viewer_session_close(VIRT_VIEWER_SESSION(priv->session));
- g_clear_object(&priv->session);
}
priv->connected = FALSE;
@@ -1265,8 +1264,10 @@ virt_viewer_app_deactivate(VirtViewerApp
if (priv->authretry) {
priv->authretry = FALSE;
g_idle_add(virt_viewer_app_retryauth, self);
- } else
+ } else {
+ g_clear_object(&priv->session);
virt_viewer_app_deactivated(self, connect_error);
+ }
}
++++++ 52fce019-dont-hide-main-window-when-disconnecting.patch ++++++
Subject: Don't hide the main window when disconnecting
From: Jonathon Jongsma jjongsma@redhat.com Fri Jan 31 13:59:42 2014 -0600
Date: Thu Feb 13 09:09:13 2014 -0600:
Git: ed9b3f3450832c0b17b80468748aff4bddfcec34
The main window (display #1) is treated a bit differently from other windows,
since it is opened at app start and displays status messages while we attempt to
connect to the remote guest. As such, it should really stay open as long as the
app is running.
The impetus for this change is the following:
- user attempts to connect to a remote VNC display with a password
- user types the wrong password
- A dialog pops up indicating that authentication failed and asking if the user
would like to try to re-connect.
- User clicks 'Yes'
- Because the connection was disconnected, all windows are closed
- remote-viewer tries to reconnect again, at which point a new display window is
opened, and the window gets placed by the window manager (possibly on another
monitor altogether).
As a user, I expect the program to simply re-use the existing window when trying
to re-authenticate, instead of having the window disappear and then re-appear at
a different location. This patch accomplishes that.
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 6f29ae0..5620105 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -455,13 +455,15 @@ static void hide_one_window(gpointer key G_GNUC_UNUSED,
gpointer value,
gpointer user_data G_GNUC_UNUSED)
{
- virt_viewer_window_hide(VIRT_VIEWER_WINDOW(value));
+ VirtViewerApp* self = VIRT_VIEWER_APP(user_data);
+ if (self->priv->main_window != value)
+ virt_viewer_window_hide(VIRT_VIEWER_WINDOW(value));
}
static void
virt_viewer_app_hide_all_windows(VirtViewerApp *app)
{
- g_hash_table_foreach(app->priv->windows, hide_one_window, NULL);
+ g_hash_table_foreach(app->priv->windows, hide_one_window, app);
}
G_MODULE_EXPORT void
++++++ 52fce019-set-VNC-display-ready-after-VNC-initialized.patch ++++++
Subject: Don't set VNC display to ready until vnc is initialized
From: Jonathon Jongsma jjongsma@redhat.com Fri Jan 31 14:48:35 2014 -0600
Date: Thu Feb 13 09:09:13 2014 -0600:
Git: 51c3a0decf21e9cfc200e20ad6635f39262efdf9
We were setting the show_hint to READY as soon as we got the vnc-connected
signal. But there may be an authentication step between vnc-connected and
vnc-initialized. In this case, we switch to an empty black display during the
authentication step instead of showing the 'waiting for display N' status.
diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
index 32119bc..3a1cc06 100644
--- a/src/virt-viewer-display-vnc.c
+++ b/src/virt-viewer-display-vnc.c
@@ -113,6 +113,14 @@ virt_viewer_display_vnc_key_ungrab(VncDisplay *vnc G_GNUC_UNUSED,
}
static void
+virt_viewer_display_vnc_initialized(VncDisplay *vnc G_GNUC_UNUSED,
+ VirtViewerDisplay *display)
+{
+ virt_viewer_display_set_show_hint(display,
+ VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, TRUE);
+}
+
+static void
virt_viewer_display_vnc_send_keys(VirtViewerDisplay* display,
const guint *keyvals,
int nkeyvals)
@@ -194,6 +202,8 @@ virt_viewer_display_vnc_new(VncDisplay *vnc)
G_CALLBACK(virt_viewer_display_vnc_key_grab), display);
g_signal_connect(display->priv->vnc, "vnc-keyboard-ungrab",
G_CALLBACK(virt_viewer_display_vnc_key_ungrab), display);
+ g_signal_connect(display->priv->vnc, "vnc-initialized",
+ G_CALLBACK(virt_viewer_display_vnc_initialized), display);
return GTK_WIDGET(display);
}
diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c
index 337cb92..746e1c0 100644
--- a/src/virt-viewer-session-vnc.c
+++ b/src/virt-viewer-session-vnc.c
@@ -100,8 +100,6 @@ virt_viewer_session_vnc_connected(VncDisplay *vnc G_GNUC_UNUSED,
{
GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc);
g_signal_emit_by_name(session, "session-connected");
- virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display),
- VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, TRUE);
virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session),
VIRT_VIEWER_DISPLAY(display));
}
++++++ 530b1cfc-german-translation-send-key-fix.patch ++++++
Subject: Fix german translation of send key
From: Daniel P. Berrange berrange@redhat.com Mon Feb 24 10:20:44 2014 +0000
Date: Mon Feb 24 10:20:44 2014 +0000:
Git: 843910a522b8bb752609ee11584fb790e84cc635
Signed-off-by: Daniel P. Berrange