From 9c5f7bfcf206fe4d8b48caefe13580066a61487f Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 7 Nov 2011 12:03:37 +0000
Subject: [PATCH] Require GTK-VNC 0.4.3 and remove redundant realize() call

Remove call to gtk_widget_realize for the GTK-VNC widget. Requires
GTK-VNC >= 0.4.3
---
 README                      | 4 ++--
 configure.ac                | 2 +-
 mingw32-virt-viewer.spec.in | 4 ++--
 src/virt-viewer-window.c    | 2 --
 virt-viewer.spec.in         | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/README b/README
index fca04c1..d1f551f 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ with:
 
    ./configure --with-gtk=3.0  (or =2.0)
 
-Virt Viewer uses the GTK-VNC widget to provide a display
-of the VNC protocol. This is available from
+Virt Viewer uses the GTK-VNC (>= 0.4.3) widget to provide a
+display of the VNC protocol. This is available from
 
   http://gtk-vnc.sourceforge.net/
 
diff --git a/configure.ac b/configure.ac
index e7985d8..4fee775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ LIBXML2_REQUIRED="2.6.0"
 LIBVIRT_REQUIRED="0.6.0"
 GTK2_REQUIRED="2.12.0"
 GTK3_REQUIRED="3.0"
-GTK_VNC_REQUIRED="0.3.8"
+GTK_VNC_REQUIRED="0.4.3"
 SPICE_GTK_REQUIRED="0.6"
 
 AC_PROG_CC
diff --git a/mingw32-virt-viewer.spec.in b/mingw32-virt-viewer.spec.in
index 6e3af74..39565b4 100644
--- a/mingw32-virt-viewer.spec.in
+++ b/mingw32-virt-viewer.spec.in
@@ -29,9 +29,9 @@ BuildRequires:  mingw32-gtk2 >= 2.12.0
 BuildRequires:  mingw32-libvirt >= 0.6.0
 BuildRequires:  mingw32-libxml2
 %if %{with_gtk3}
-BuildRequires:  mingw32-gtk-vnc >= 0.3.8
+BuildRequires:  mingw32-gtk-vnc >= 0.4.3
 %else
-BuildRequires:  mingw32-gtk-vnc2 >= 0.4.0
+BuildRequires:  mingw32-gtk-vnc2 >= 0.4.3
 %endif
 BuildRequires:  pkgconfig
 
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index b3b986b..3176151 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -878,8 +878,6 @@ virt_viewer_window_set_display(VirtViewerWindow *self, VirtViewerDisplay *displa
 		virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
 
 		gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), GTK_WIDGET(display), NULL);
-		if (gtk_bin_get_child(GTK_BIN(display)))
-			gtk_widget_realize(GTK_WIDGET(gtk_bin_get_child(GTK_BIN(display))));
 		gtk_widget_show_all(GTK_WIDGET(display));
 
 		g_signal_connect(display, "display-pointer-grab",
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index 2c83246..c894099 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -40,7 +40,7 @@ BuildRequires: libxml2-devel
 %if %{with_gtk3}
 BuildRequires: gtk-vnc2-devel >= 0.4.3
 %else
-BuildRequires: gtk-vnc-devel >= 0.3.8
+BuildRequires: gtk-vnc-devel >= 0.4.3
 %endif
 %if %{with_spice}
 %if %{with_gtk3}