[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.3.9-1-4-g52c3a40

[Guido Günther]

The following commit has been merged in the master branch:
commit 1f2e3c5c8c79f3c250075bf858a7c0ba2d5637f3
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Aug 18 18:25:00 2009 +0200

    say "disconnected from server" only once connected
    
    Thanks: Michal Suchanek
    Closes: #540435

diff --git a/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch b/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch
new file mode 100644
index 0000000..dc51225
--- /dev/null
+++ b/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch
@@ -0,0 +1,39 @@
+From: Michal Suchanek <hramrach at centrum.cz>
+Date: Tue, 18 Aug 2009 18:20:46 +0200
+Subject: [PATCH] say "disconnected from server" only once connected
+
+Closes: #540435
+---
+ examples/gvncviewer.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
+index 6373564..777b8c8 100644
+--- a/examples/gvncviewer.c
++++ b/examples/gvncviewer.c
+@@ -84,9 +84,12 @@ static void vnc_ungrab(GtkWidget *vncdisplay, GtkWidget *window)
+ 	set_title(VNC_DISPLAY(vncdisplay), window, FALSE);
+ }
+ 
++static int connected = 0;
++
+ static void vnc_connected(GtkWidget *vncdisplay G_GNUC_UNUSED)
+ {
+ 	printf("Connected to server\n");
++	connected = 1;
+ }
+ 
+ static void vnc_initialized(GtkWidget *vncdisplay, GtkWidget *window)
+@@ -110,7 +113,10 @@ static void vnc_desktop_resize(GtkWidget *vncdisplay G_GNUC_UNUSED,
+ 
+ static void vnc_disconnected(GtkWidget *vncdisplay G_GNUC_UNUSED)
+ {
+-	printf("Disconnected from server\n");
++	if(connected)
++		printf("Disconnected from server\n");
++	else
++		printf("Failed to connect to server\n");
+ 	gtk_main_quit();
+ }
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 7ca143d..781715f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-use-xulrunner-not-mozilla.patch
+0002-say-disconnected-from-server-only-once-connected.patch

-- 
libgtk-vnc Debian packaging