Merge lp:~jtaylor/ubuntu/oneiric/gnome-rdp/fix-vnc-879686 into lp:ubuntu/oneiric/gnome-rdp

[Julian Taylor]

SRU request in the linked bug

[Luke Yelavich (themuso)]

Thanks for your work, uploaded with the maintainer field updated.

review: Approve

[Stéphane Graber (stgraber)]

Marking as approved as Luke uploaded it.

Unmerged revisions

15. By Julian Taylor on 2011-10-21

add patch to fix vnc connections (LP: #879686)
use xtightvncviewer, tight-vncviewer does not exist in debian
xtightvncviewer does not accepted -user flag and it must receive
a server to connect to.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-07 17:18:42 +0000
+++ debian/changelog	2011-10-22 22:09:25 +0000
@@ -1,3 +1,12 @@
+gnome-rdp (0.3.0.9-1ubuntu0.1) oneiric-proposed; urgency=low
+
+  * add patch to fix vnc connections (LP: #879686)
+    use xtightvncviewer, tight-vncviewer does not exist in debian
+    xtightvncviewer does not accepted -user flag and it must receive
+    a server to connect to. 
+
+ -- Julian Taylor <[e-mail]>  Fri, 21 Oct 2011 23:50:37 +0200
+
 gnome-rdp (0.3.0.9-1) unstable; urgency=low
 
   * new upstream version
 
=== added file 'debian/patches/fix-vnc-connections.patch'
--- debian/patches/fix-vnc-connections.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-vnc-connections.patch	2011-10-22 22:09:25 +0000
@@ -0,0 +1,63 @@
+From: Julian Taylor <[e-mail]>
+Date: Fri, 9 Sep 2011 14:45:24 +0200
+Description: fix vnc connections
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-rdp/+bug/879686
+Forwarded: [e-mail]
+
+use xtightvncviewer, tight-vncviewer does not exist in debian
+xtightvncviewer does not accepted -user flag and it must receive
+a server to connect to.
+---
+ Sessions/SessionCollection.cs |    4 ++--
+ Vnc/VncProfile.cs             |    6 ++++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Sessions/SessionCollection.cs b/Sessions/SessionCollection.cs
+index 2920e21..2e4a6e3 100644
+--- a/Sessions/SessionCollection.cs
++++ b/Sessions/SessionCollection.cs
+@@ -83,7 +83,7 @@ namespace GnomeRDP.Sessions
+ 				string args = vncProfile.ToCommandLineArguements(session.Server, session.Identity, false);
+ 				string safeArgs = vncProfile.ToCommandLineArguements(session.Server, session.Identity, true);
+ 				
+-				new SessionHost("tight-vncviewer", args, safeArgs);
++				new SessionHost("xtightvncviewer", args, safeArgs);
+ 			}
+ 			
+ 			if (session.Profile is Ssh.SshProfile)
+@@ -96,4 +96,4 @@ namespace GnomeRDP.Sessions
+ 			}			
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+diff --git a/Vnc/VncProfile.cs b/Vnc/VncProfile.cs
+index e661d75..1eb0128 100644
+--- a/Vnc/VncProfile.cs
++++ b/Vnc/VncProfile.cs
+@@ -158,7 +158,7 @@ namespace GnomeRDP.Vnc
+ 			StringBuilder text = new StringBuilder();
+ 			
+ 			string user = (identity == null) ? null : identity.Username;
+-			if (string.IsNullOrEmpty(user) == false)
++			if (false)
+ 			{
+ 				if (user.Contains(" "))
+ 				{
+@@ -181,8 +181,10 @@ namespace GnomeRDP.Vnc
+ 			{
+ 				text.AppendFormat(" -encodings {0}",  encoding.ToString().ToLower());
+ 			}
++
++			text.AppendFormat(" {0}", server);
+ 			
+ 			return text.ToString();
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+-- 
+1.7.5.4
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-07 17:18:42 +0000
+++ debian/patches/series	2011-10-22 22:09:25 +0000
@@ -1,2 +1,3 @@
 include_ac_expansions.patch
 use_default_compiler.patch
+fix-vnc-connections.patch