[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.5.6-1

[Guido Günther]

The following commit has been merged in the master branch:
commit a40ea7df4c9caf7dee078c777a65cf40cf11d62b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jun 25 12:19:05 2013 +0200

    Drop Patches
    
    fixed upstream.

diff --git a/debian/patches/0001-Fail-if-opening-the-connection-fails.patch b/debian/patches/0001-Fail-if-opening-the-connection-fails.patch
deleted file mode 100644
index 53c7a34..0000000
--- a/debian/patches/0001-Fail-if-opening-the-connection-fails.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 22 Oct 2012 20:05:24 +0200
-Subject: Fail if opening the connection fails
-
-instead of returning True. Which then fails with the misleading error
-
-(virt-viewer:18631): Gtk-WARNING **: Attempting to add a widget with type
-VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is
-already inside a container of type VirtViewerDisplayVnc, please use
-gtk_widget_reparent()
----
- src/virt-viewer.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/virt-viewer.c b/src/virt-viewer.c
-index 3143104..572e9e6 100644
---- a/src/virt-viewer.c
-+++ b/src/virt-viewer.c
-@@ -425,7 +425,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd)
-         DEBUG_LOG("Error %s", err && err->message ? err->message : "Unknown");
-         close(pair[0]);
-         close(pair[1]);
--        return TRUE;
-+        return FALSE;
-     }
-     close(pair[0]);
-     *fd = pair[1];
diff --git a/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch b/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
deleted file mode 100644
index 905a9cb..0000000
--- a/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 22 Oct 2012 21:56:07 +0200
-Subject: Don't fail early if virDomainOpenGraphics fails
-
-virt_viewer_app_open_connection invokes virDomainOpenGraphics which only works
-for local connections. Returning after this failure makes us never reach the
-ssh part so this unbreaks connections tunneled over ssh.
----
- src/virt-viewer-app.c |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
-index def52c5..28dc8cb 100644
---- a/src/virt-viewer-app.c
-+++ b/src/virt-viewer-app.c
-@@ -820,8 +820,7 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
-     VirtViewerAppPrivate *priv = self->priv;
-     int fd = -1;
- 
--    if (!virt_viewer_app_open_connection(self, &fd))
--        return -1;
-+    virt_viewer_app_open_connection(self, &fd);
- 
-     DEBUG_LOG("After open connection callback fd=%d", fd);
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c39d1b2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fail-if-opening-the-connection-fails.patch
-0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch

-- 
VirtViewer Debian packaging