[Pkg-libvirt-commits] [SCM] Virt Manager packaging branch, master, updated. debian/0.6.1-4

[Guido Günther]

The following commit has been merged in the master branch:
commit 17b69afdfe655819d7b59a2d0beb72176d79a73f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Feb 19 17:19:12 2009 +0100

    gtk-vnc 0.3.8 uses cairo
    
    so no need to forbid scaling with compiz

diff --git a/debian/control b/debian/control
index 72f892c..ee622e7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: virt-manager
 Section: admin
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-gnome2, python-dbus, python-urlgrabber, python-vte, librsvg2-common, python-libvirt (>= 0.4.6), virtinst (>= 0.400.1), python-gtk-vnc (>= 0.3.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-gnome2, python-dbus, python-urlgrabber, python-vte, librsvg2-common, python-libvirt (>= 0.4.6), virtinst (>= 0.400.1), python-gtk-vnc (>= 0.3.8)
 Recommends: hal, libvirt-bin (>= 0.4.6)
 Suggests: virt-viewer
 XB-Python-Version: ${python:Versions}
diff --git a/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch b/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
new file mode 100644
index 0000000..2b8aba9
--- /dev/null
+++ b/debian/patches/0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 19 Feb 2009 16:18:13 +0100
+Subject: [PATCH] gtk-vnc 0.3.8 handles rescaling with compiz
+
+gtk-vnc 0.3.8 handle compositioning so scaling can be used in that case too.
+---
+ src/virtManager/details.py |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/virtManager/details.py b/src/virtManager/details.py
+index 94a31c8..95e0696 100644
+--- a/src/virtManager/details.py
++++ b/src/virtManager/details.py
+@@ -222,9 +222,8 @@ class vmmDetails(gobject.GObject):
+         else:
+             self.vncViewer.set_keyboard_grab(False)
+         self.vncViewer.set_pointer_grab(True)
+-        if not topwin.is_composited():
+-            self.vncViewer.set_scaling(True)
+-            self.window.get_widget("details-menu-view-scale-display").set_active(True)
++        self.vncViewer.set_scaling(True)
++        self.window.get_widget("details-menu-view-scale-display").set_active(True)
+ 
+         self.vncViewer.connect("vnc-pointer-grab", self.notify_grabbed)
+         self.vncViewer.connect("vnc-pointer-ungrab", self.notify_ungrabbed)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a75113c..10ded7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-remove-disambiguity-in-storage-dialog.patch
 0003-hint-to-ssh-askpass.patch
 0004-make-fullscreen-mode-more-useful.patch
+0005-gtk-vnc-0.3.8-handles-rescaling-with-compiz.patch

-- 
Virt Manager packaging