Merge lp:~paulliu/ubuntu/quantal/freerdp/forubuntu into lp:ubuntu/quantal/freerdp

[Ying-Chun Liu]

[Ying-Chun Liu (paulliu)]

Hi.
The current version of freerdp in Ubuntu Quantal cannot load any extensions due to there is a bug.
This commit fix the extension loading bug.

Thanks,
Paul

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-13 19:08:57 +0000
+++ .pc/applied-patches	2012-06-21 07:02:20 +0000
@@ -1,2 +1,3 @@
 remote_control.diff
 cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
+cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-13 19:08:57 +0000
+++ debian/changelog	2012-06-21 07:02:20 +0000
@@ -1,3 +1,10 @@
+freerdp (1.0.1-1ubuntu5) quantal; urgency=low
+
+  * Add debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
+    Fix freerdp extension handling problem. (LP: 1015897)
+
+ -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Thu, 21 Jun 2012 13:34:16 +0800
+
 freerdp (1.0.1-1ubuntu4) quantal; urgency=low
 
   * Cherry pick upstream bugfix for crash when $HOME is unset.

=== added file 'debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch'
--- debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch	2012-06-21 07:02:20 +0000
@@ -0,0 +1,44 @@
+From 48ad5feb0a6ad831d863f89ed74b443021e54303 Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <[e-mail]>
+Date: Tue, 19 Jun 2012 14:49:53 +0800
+Subject: [PATCH] Init extensions in pre_connect stage.
+
+Due to the client is parsing the args in pre_connect,
+we should start loading the extensions after client parsing the args.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <[e-mail]>
+---
+ libfreerdp-core/freerdp.c |    5 +++--
+ libfreerdp-core/rdp.c     |    1 -
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: freerdp/libfreerdp-core/freerdp.c
+===================================================================
+--- freerdp.orig/libfreerdp-core/freerdp.c	2012-06-20 17:35:11.000000000 +0800
++++ freerdp/libfreerdp-core/freerdp.c	2012-06-20 17:38:41.258489372 +0800
+@@ -35,10 +35,11 @@
+ 
+ 	rdp = instance->context->rdp;
+ 
+-	extension_pre_connect(rdp->extension);
+-
+ 	IFCALLRET(instance->PreConnect, status, instance);
+ 
++	rdp->extension = extension_new(instance);
++	extension_pre_connect(rdp->extension);
++
+ 	if (status != true)
+ 	{
+ 		printf("freerdp_pre_connect failed\n");
+Index: freerdp/libfreerdp-core/rdp.c
+===================================================================
+--- freerdp.orig/libfreerdp-core/rdp.c	2012-06-20 17:35:11.000000000 +0800
++++ freerdp/libfreerdp-core/rdp.c	2012-06-20 17:38:51.365185967 +0800
+@@ -878,7 +878,6 @@
+ 		rdp->settings = settings_new((void*) instance);
+ 		if (instance != NULL)
+ 			instance->settings = rdp->settings;
+-		rdp->extension = extension_new(instance);
+ 		rdp->transport = transport_new(rdp->settings);
+ 		rdp->license = license_new(rdp);
+ 		rdp->input = input_new(rdp);

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-13 19:08:57 +0000
+++ debian/patches/series	2012-06-21 07:02:20 +0000
@@ -1,2 +1,3 @@
 remote_control.diff
 cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
+cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch

=== modified file 'libfreerdp-core/freerdp.c'
--- libfreerdp-core/freerdp.c	2012-02-11 10:34:05 +0000
+++ libfreerdp-core/freerdp.c	2012-06-21 07:02:20 +0000
@@ -35,10 +35,11 @@
 
 	rdp = instance->context->rdp;
 
+	IFCALLRET(instance->PreConnect, status, instance);
+
+	rdp->extension = extension_new(instance);
 	extension_pre_connect(rdp->extension);
 
-	IFCALLRET(instance->PreConnect, status, instance);
-
 	if (status != true)
 	{
 		printf("freerdp_pre_connect failed\n");

=== modified file 'libfreerdp-core/rdp.c'
--- libfreerdp-core/rdp.c	2012-02-11 10:34:05 +0000
+++ libfreerdp-core/rdp.c	2012-06-21 07:02:20 +0000
@@ -878,7 +878,6 @@
 		rdp->settings = settings_new((void*) instance);
 		if (instance != NULL)
 			instance->settings = rdp->settings;
-		rdp->extension = extension_new(instance);
 		rdp->transport = transport_new(rdp->settings);
 		rdp->license = license_new(rdp);
 		rdp->input = input_new(rdp);