[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 52c3a40ca3987acbef0a1abcfa49dc9d2a04dc14
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Aug 18 18:25:37 2009 +0200

    allow connecting to local server by display number
    
    Closes: #540434
    Thanks: Michal Suchanek

diff --git a/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch b/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch
new file mode 100644
index 0000000..e3b2908
--- /dev/null
+++ b/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch
@@ -0,0 +1,41 @@
+From: Michal Suchanek <hramrach at centrum.cz>
+Date: Tue, 18 Aug 2009 18:23:00 +0200
+Subject: [PATCH] allow connecting to local server by display number
+
+Closes: #540434
+---
+ examples/gvncviewer.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
+index 777b8c8..b2cc30c 100644
+--- a/examples/gvncviewer.c
++++ b/examples/gvncviewer.c
+@@ -36,7 +36,7 @@ static const GOptionEntry options [] =
+ {
+   {
+     G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &args,
+-    NULL, "hostname[:display]" },
++    NULL, "[hostname][:display]" },
+   { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, 0 }
+ };
+ 
+@@ -383,7 +383,7 @@ int main(int argc, char **argv)
+ 		return 1;
+ 	}
+ 	if (!args || (g_strv_length(args) != 1)) {
+-		fprintf(stderr, "Usage: gvncviewer hostname[:display]\n%s\n", help_msg);
++		fprintf(stderr, "Usage: gvncviewer [hostname][:display]\n%s\n", help_msg);
+ 		return 1;
+ 	}
+ 
+@@ -461,6 +461,8 @@ int main(int argc, char **argv)
+ 	} else
+ 		snprintf(port, sizeof(port), "%d", 5900);
+ 
++	if(! *hostname)
++		snprintf(hostname, sizeof(hostname), "%s", "127.0.0.1");
+ 	vnc_display_open_host(VNC_DISPLAY(vnc), hostname, port);
+ 	vnc_display_set_keyboard_grab(VNC_DISPLAY(vnc), TRUE);
+ 	vnc_display_set_pointer_grab(VNC_DISPLAY(vnc), TRUE);
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 781715f..a3e8fe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-use-xulrunner-not-mozilla.patch
 0002-say-disconnected-from-server-only-once-connected.patch
+0003-allow-connecting-to-local-server-by-display-number.patch

-- 
libgtk-vnc Debian packaging