Update necessary. Upstream merged new freerdp interface.

7 files changed, 3 insertions, 479 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e7a171dea3b..798b12577c5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pacmanager-git
 	pkgdesc = Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface.
 	pkgver = 4.5.5.8
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/perseo22/pacmanager
 	arch = any
 	license = GPL3
@@ -24,18 +24,8 @@ pkgbase = pacmanager-git
 	depends = uuid
 	conflicts = pacmanager-bin
 	source = git+https://github.com/perseo22/pacmanager.git
-	source = 0001-xfreerdp-new-interface.patch
-	source = 0002-xfreerdp-new-interface.patch
-	source = 0003-xfreerdp-new-interface.patch
-	source = 0004-xfreerdp-new-interface.patch
-	source = bugfix_ctrl-tab_in_last-focused_mode.patch
 	source = fix_xfreerdp_embed_window.patch
 	sha256sums = SKIP
-	sha256sums = 98ab734e299083913b7d9f23dff047c3cc18bfc704e851b501930229c31f4d0a
-	sha256sums = e2a169dd9267cde0eb426c3de470a584aeb5d96d5dc1ee038532b9e03abedb73
-	sha256sums = dda5927251b70cc70e4a0590136b1b38aa5e85d490f7babf6fdf06391518892d
-	sha256sums = d65a594621469929f5f9f121074e37e048003b91119bda10d56909fa73b5c735
-	sha256sums = 1396ce5405269093053c21d5673dee61ab1f9a313000490a2c413a561040c151
 	sha256sums = 678379ca96a59434ec623ecff8765969fcda5d41bc540ff5a587471c3e217b0e
 
 pkgname = pacmanager-git
diff --git a/0001-xfreerdp-new-interface.patch b/0001-xfreerdp-new-interface.patch
deleted file mode 100644
index 3006d0b9fb0b..000000000000
--- a/0001-xfreerdp-new-interface.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-From 71f3d8e03f91b9939661f57b9416337a69bf6f93 Mon Sep 17 00:00:00 2001
-From: Andrea Fagiani <andfagiani@gmail.com>
-Date: Wed, 13 Apr 2016 10:20:47 +0200
-Subject: [PATCH] xfreerdp method: use new command line interface
-
----
- lib/method/PACMethod_xfreerdp.pm | 136 +++++++++++++++++++++------------------
- lib/pac_conn                     |   3 +
- 2 files changed, 75 insertions(+), 64 deletions(-)
-
-diff --git a/lib/method/PACMethod_xfreerdp.pm b/lib/method/PACMethod_xfreerdp.pm
-index d064c5d..622c830 100644
---- a/lib/method/PACMethod_xfreerdp.pm
-+++ b/lib/method/PACMethod_xfreerdp.pm
-@@ -98,6 +98,7 @@ sub update {
- 	$$self{gui}{chNoTLS}				-> set_active( $$options{noTLS} // 0 );
- 	$$self{gui}{chNoNLA}				-> set_active( $$options{noNLA} // 0 );
- 	$$self{gui}{chFontSmooth}			-> set_active( $$options{fontSmooth} // 0 );
-+	$$self{gui}{chNoGrabKbd}			-> set_active( $$options{noGrabKbd} // 0 );
- 	$$self{gui}{entryStartupShell}		-> set_text( $$options{startupshell} // '' );
- 
- 	# Destroy previuos widgets
-@@ -140,6 +141,7 @@ sub get_cfg {
- 	$options{noTLS}             = $$self{gui}{chNoTLS}				-> get_active;
- 	$options{noNLA}             = $$self{gui}{chNoNLA}				-> get_active;
- 	$options{fontSmooth}		= $$self{gui}{chFontSmooth}			-> get_active;
-+	$options{noGrabKbd}		= $$self{gui}{chNoGrabKbd}			-> get_active;
- 	$options{startupshell}		= $$self{gui}{entryStartupShell}	-> get_chars( 0, -1 );
- 
- 	foreach my $w ( @{ $$self{listRedir} } ) {
-@@ -189,35 +191,37 @@ sub _parseCfgToOptions {
- 	$hash{noTLS}            = 0;
- 	$hash{noNLA}            = 0;
- 	$hash{fontSmooth}		= 0;
-+        $hash{noGrabKbd}                = 0;
- 	$hash{startupshell}		= '';
- 	
--	my @opts = split( /\s+-/, $cmd_line );
-+	my @opts = split( /\s+\/?/, $cmd_line );
- 	foreach my $opt ( @opts ) {
- 		next unless $opt ne '';
- 		$opt =~ s/\s+$//go;
- 		
--		$opt =~ /^a\s+(8|15|16|24)$/go		and	$hash{bpp}				= $1;
--		$opt eq '0'							and	$hash{attachToConsole}	= 1;
--		$opt eq 'z'							and	$hash{useCompression}	= 1;
--		if ( $opt =~ /^s\s+'(.+?)'$/go )	 {	$hash{startupshell} = $1; }
--		if ( $opt eq 'f' ) {					$hash{fullScreen} = 1; $hash{percent} = 0; $hash{wh} = 0; $hash{'embed'} = 0; }
--		if ( $opt =~ /^g\s+(\d+)\%$/go ) {		$hash{geometry} = $1; $hash{percent} = 1; $hash{wh} = 0; $hash{'embed'} = 0; }
--		if ( $opt =~ /^g\s+(\d+)x(\d+)$/go ) {	$hash{width} = $1; $hash{height} = $2; $hash{wh} = 1; $hash{percent} = 0; $hash{'embed'} = 0; }
--		$opt =~ /^k\s+(.+)$/go				and	$hash{keyboardLocale}	= $1;
--		$opt =~ /^-plugin\s+rdpsnd$/go		and	$hash{redirSound}		= 1;
--		$opt =~ /^-plugin\s+cliprdr$/go		and	$hash{redirClipboard}	= 1;
--		$opt =~ /^d\s+(.+)$/go				and	$hash{domain}			= $1;
--		$opt =~ /^-ignore-certificate$/go	and	$hash{ignoreCert}		= 1;
--		$opt =~ /^-no-auth$/go				and	$hash{noAuth}			= 1;
--		$opt =~ /^-no-fastpath$/go			and	$hash{nofastPath}		= 1;
--		$opt =~ /^-rfx$/go					and	$hash{rfx}				= 1;
--		$opt =~ /^-nsc$/go					and	$hash{nsCodec}			= 1;
--		$opt =~ /^-no-rdp$/go				and	$hash{noRDP}			= 1;
--		$opt =~ /^-no-tls$/go				and	$hash{noTLS}			= 1;
--		$opt =~ /^-no-nla$/go				and	$hash{noNLA}			= 1;
--		$opt =~ /^x\s+80$/go				and	$hash{fontSmooth}		= 1;
-+		$opt =~ /^bpp:(8|15|16|24)$/go	  and	$hash{bpp}				= $1;
-+		$opt eq 'admin'	                  and	$hash{attachToConsole}	= 1;
-+		$opt eq '+compression'		  and	$hash{useCompression}	= 1;
-+		if ( $opt =~ /^shell\s+'(.+?)'$/go )  {	$hash{startupshell} = $1; }
-+		if ( $opt eq 'f' )                    {	$hash{fullScreen} = 1; $hash{percent} = 0; $hash{wh} = 0; $hash{'embed'} = 0; }
-+		if ( $opt =~ /^size:(\d+)\%$/go )     {	$hash{geometry} = $1; $hash{percent} = 1; $hash{wh} = 0; $hash{'embed'} = 0; }
-+		if ( $opt =~ /^size:(\d+)x(\d+)$/go ) {	$hash{width} = $1; $hash{height} = $2; $hash{wh} = 1; $hash{percent} = 0; $hash{'embed'} = 0; }
-+		$opt =~ /^kbd:(.+)$/go		and	$hash{keyboardLocale}	= $1;
-+		$opt =~ /^sound:sys:alsa$/go	and	$hash{redirSound}	= 1;
-+		$opt =~ /^\+clipboard$/go	and	$hash{redirClipboard}	= 1;
-+		$opt =~ /^d:(.+)$/go		and	$hash{domain}		= $1;
-+		$opt =~ /^cert-ignore$/go	and	$hash{ignoreCert}	= 1;
-+		$opt =~ /^-authentication$/go	and	$hash{noAuth}		= 1;
-+		$opt =~ /^-fast-path$/go	and	$hash{nofastPath}	= 1;
-+		$opt =~ /^rfx$/go		and	$hash{rfx}		= 1;
-+		$opt =~ /^nsc$/go		and	$hash{nsCodec}		= 1;
-+		$opt =~ /^-sec-rdp$/go		and	$hash{noRDP}		= 1;
-+		$opt =~ /^-sec-tls$/go		and	$hash{noTLS}		= 1;
-+		$opt =~ /^-sec-nla$/go		and	$hash{noNLA}		= 1;
-+		$opt =~ /^\+fonts$/go		and	$hash{fontSmooth}	= 1;
-+		$opt =~ /^-grab-keyboard$/go	and	$hash{noGrabKbd}	= 1;
- 		
--		while ( $opt =~ /^-data\s+disk:(.+):\"(.+)\"/go )
-+		while ( $opt =~ /^drive:(.+):(.+)/go )
- 		{
- 			my %redir;
- 			$redir{redirDiskShare}	= $1;
-@@ -234,35 +238,35 @@ sub _parseOptionsToCfg {
- 	
- 	my $txt = '';
- 	
--	$txt .= ' -a ' . $$hash{bpp};
--	$txt .= ' -0' if $$hash{attachToConsole};
--	$txt .= ' -z' if $$hash{useCompression};
--	$txt .= ' -f' if $$hash{fullScreen};
-+	$txt .= ' /bpp:' . $$hash{bpp};
-+	$txt .= ' /admin' if $$hash{attachToConsole};
-+	$txt .= ' +compression' if $$hash{useCompression};
-+	$txt .= ' /f' if $$hash{fullScreen};
- 	if ( $$hash{percent} )
- 	{
--		$txt .= ' -g ' . $$hash{geometry} . '%';
-+		$txt .= ' /size:' . $$hash{geometry} . '%';
- 	}
- 	elsif ( $$hash{wh} )
- 	{
--		$txt .= ' -g ' . $$hash{width} . 'x' . $$hash{height};
-+		$txt .= ' /size:' . $$hash{width} . 'x' . $$hash{height};
- 	}
--	$txt .= ' -k ' . $$hash{keyboardLocale} if $$hash{keyboardLocale} ne '';
--	$txt .= " -s '$$hash{startupshell}'" if $$hash{startupshell} ne '';
--	$txt .= " -d $$hash{domain}" if $$hash{domain} ne '';
--	$txt .= ' --plugin cliprdr' if $$hash{redirClipboard};
--	$txt .= ' --plugin rdpsnd' if $$hash{redirSound};
--	
--	$txt .= ' --ignore-certificate' if $$hash{ignoreCert};
--	$txt .= ' --no-auth' if $$hash{noAuth};
--	$txt .= ' --no-fastpath' if $$hash{nofastPath};
--	$txt .= ' --rfx' if $$hash{rfx};
--	$txt .= ' --nsc' if $$hash{nsCodec};
--	$txt .= ' --no-rdp' if $$hash{noRDP};
--	$txt .= ' --no-tls' if $$hash{noTLS};
--	$txt .= ' --no-nla' if $$hash{noNLA};
--	$txt .= ' -x 80' if $$hash{fontSmooth};
--	
--	foreach my $redir ( @{ $$hash{redirDisk} } ) { $txt .= " --plugin rdpdr --data disk:$$redir{redirDiskShare}:\"$$redir{redirDiskPath}\" --"; }
-+	$txt .= ' /kbd:' . $$hash{keyboardLocale} if $$hash{keyboardLocale} ne '';
-+	$txt .= ' /shell ' . $$hash{startupshell} if $$hash{startupshell} ne '';
-+	$txt .= ' /d:' . $$hash{domain} if $$hash{domain} ne '';
-+	$txt .= ' +clipboard' if $$hash{redirClipboard};
-+	$txt .= ' +sound:sys:alsa' if $$hash{redirSound};
-+	$txt .= ' /cert-ignore' if $$hash{ignoreCert};
-+	$txt .= ' -authentication' if $$hash{noAuth};
-+	$txt .= ' -fast-path' if $$hash{nofastPath};
-+	$txt .= ' /rfx' if $$hash{rfx};
-+	$txt .= ' /nsc' if $$hash{nsCodec};
-+	$txt .= ' -sec-rdp' if $$hash{noRDP};
-+	$txt .= ' -sec-tls' if $$hash{noTLS};
-+	$txt .= ' -sec-nla' if $$hash{noNLA};
-+	$txt .= ' +fonts' if $$hash{fontSmooth};
-+	$txt .= ' -grab-keyboard' if $$hash{noGrabKbd};
-+	
-+	foreach my $redir ( @{ $$hash{redirDisk} } ) { $txt .= " /drive:$$redir{redirDiskShare}:$$redir{redirDiskPath}"; }
- 	
- 	return $txt;
- }
-@@ -288,7 +292,7 @@ sub _buildGUI {
- 			$w{frBPP} = Gtk2::Frame -> new( 'BPP:' );
- 			$w{hbox1} -> pack_start( $w{frBPP}, 0, 1, 0 );
- 			$w{frBPP} -> set_shadow_type( 'GTK_SHADOW_NONE' );
--			$w{frBPP} -> set_tooltip_text( '[-a] : Sets the colour depth for the connection (8, 15, 16 or 24)' );
-+			$w{frBPP} -> set_tooltip_text( '[/bpp:] : Sets the colour depth for the connection (8, 15, 16 or 24)' );
- 				
- 				$w{cbBPP} = Gtk2::ComboBox -> new_text;
- 				$w{frBPP} -> add( $w{cbBPP} );
-@@ -296,53 +300,57 @@ sub _buildGUI {
- 			
- 			$w{chAttachToConsole} = Gtk2::CheckButton -> new_with_label( 'Attach to console' );
- 			$w{hbox1} -> pack_start( $w{chAttachToConsole}, 0, 1, 0 );
--			$w{chAttachToConsole} -> set_tooltip_text( '[-0] : Attach to console of server (requires Windows Server 2003 or newer)' );
-+			$w{chAttachToConsole} -> set_tooltip_text( '[/admin] : Attach to admin console of server (requires Windows Server 2003 or newer)' );
- 			
- 			$w{chUseCompression} = Gtk2::CheckButton -> new_with_label( 'Compression' );
- 			$w{hbox1} -> pack_start( $w{chUseCompression}, 0, 1, 0 );
--			$w{chUseCompression} -> set_tooltip_text( '[-z] : Enable compression of the RDP datastream' );
-+			$w{chUseCompression} -> set_tooltip_text( '[+compression] : Enable compression of the RDP datastream' );
- 			
- 			$w{chIgnoreCert} = Gtk2::CheckButton -> new_with_label( 'Ignore verification of logon certificate' );
- 			$w{hbox1} -> pack_start( $w{chIgnoreCert}, 0, 1, 0 );
--			$w{chIgnoreCert} -> set_tooltip_text( "--ignore-certificate: ignore verification of logon certificate" );
-+			$w{chIgnoreCert} -> set_tooltip_text( "/cert-ignore: ignore verification of logon certificate" );
- 			
- 			$w{chFontSmooth} = Gtk2::CheckButton -> new_with_label( 'Font Smooth' );
- 			$w{hbox1} -> pack_start( $w{chFontSmooth}, 0, 1, 0 );
--			$w{chFontSmooth} -> set_tooltip_text( "-x 80: enable font smoothing" );
-+			$w{chFontSmooth} -> set_tooltip_text( "+fonts: enable font smoothing" );
-+
-+			$w{chNoGrabKbd} = Gtk2::CheckButton -> new_with_label( 'Do not grab keyboard' );
-+			$w{hbox1} -> pack_start( $w{chNoGrabKbd}, 0, 1, 0 );
-+			$w{chNoGrabKbd} -> set_tooltip_text( "-grab-keyboard: do not grab keyboard" );
- 		
- 		$w{hbox3} = Gtk2::HBox -> new( 0, 5 );
- 		$w{vbox} -> pack_start( $w{hbox3}, 0, 1, 5 );
- 			
- 			$w{chNoAuth} = Gtk2::CheckButton -> new_with_label( 'No Authentication' );
- 			$w{hbox3} -> pack_start( $w{chNoAuth}, 0, 1, 0 );
--			$w{chNoAuth} -> set_tooltip_text( "--no-auth: disable authentication" );
-+			$w{chNoAuth} -> set_tooltip_text( "-authentication: disable authentication" );
- 			
- 			$w{chNoFastPath} = Gtk2::CheckButton -> new_with_label( 'No Fast Path' );
- 			$w{hbox3} -> pack_start( $w{chNoFastPath}, 0, 1, 0 );
--			$w{chNoFastPath} -> set_tooltip_text( "--no-fastpath: disable fast-path" );
-+			$w{chNoFastPath} -> set_tooltip_text( "-fast-path: disable fast-path" );
- 			
- 			$w{chRFX} = Gtk2::CheckButton -> new_with_label( 'Enable RemoteFX' );
- 			$w{hbox3} -> pack_start( $w{chRFX}, 0, 1, 0 );
--			$w{chRFX} -> set_tooltip_text( "--rfx: enable RemoteFX" );
-+			$w{chRFX} -> set_tooltip_text( "/rfx: enable RemoteFX" );
- 			
- 			$w{chNSCodec} = Gtk2::CheckButton -> new_with_label( 'Enable NSCodec' );
- 			$w{hbox3} -> pack_start( $w{chNSCodec}, 0, 1, 0 );
--			$w{chNSCodec} -> set_tooltip_text( "--nsc: enable NSCodec (experimental)" );
-+			$w{chNSCodec} -> set_tooltip_text( "/nsc: enable NSCodec (experimental)" );
- 			
- 		$w{hbox4} = Gtk2::HBox -> new( 0, 5 );
- 		$w{vbox} -> pack_start( $w{hbox4}, 0, 1, 5 );
- 			
- 			$w{chNoRDP} = Gtk2::CheckButton -> new_with_label( 'Disable RDP encryption' );
- 			$w{hbox4} -> pack_start( $w{chNoRDP}, 0, 1, 0 );
--			$w{chNoRDP} -> set_tooltip_text( "--no-rdp: disable Standard RDP encryption" );
-+			$w{chNoRDP} -> set_tooltip_text( "-sec-rdp: disable Standard RDP encryption" );
- 			
- 			$w{chNoTLS} = Gtk2::CheckButton -> new_with_label( 'Disable TLS encryption' );
- 			$w{hbox4} -> pack_start( $w{chNoTLS}, 0, 1, 0 );
--			$w{chNoTLS} -> set_tooltip_text( "--no-tls: disable TLS encryption" );
-+			$w{chNoTLS} -> set_tooltip_text( "-sec-tls: disable TLS encryption" );
- 			
- 			$w{chNoNLA} = Gtk2::CheckButton -> new_with_label( 'Disable Network Level Authentication' );
- 			$w{hbox4} -> pack_start( $w{chNoNLA}, 0, 1, 0 );
--			$w{chNoNLA} -> set_tooltip_text( "--no-nla: disable network level authentication" );
-+			$w{chNoNLA} -> set_tooltip_text( "-sec-nla: disable network level authentication" );
- 		
- 		$w{hboxss} = Gtk2::HBox -> new( 0, 5 );
- 		$w{vbox} -> pack_start( $w{hboxss}, 0, 1, 5 );
-@@ -351,7 +359,7 @@ sub _buildGUI {
- 			$w{hboxss} -> pack_start( $w{lblStartupShell}, 0, 1, 0 );
- 			
- 			$w{entryStartupShell} = Gtk2::Entry -> new;
--			$w{entryStartupShell} -> set_tooltip_text( "[-s 'startupshell command'] : start given startupshell/command instead of explorer" );
-+			$w{entryStartupShell} -> set_tooltip_text( "[/shell 'startupshell command'] : start given startupshell/command instead of explorer" );
- 			$w{hboxss} -> pack_start( $w{entryStartupShell}, 1, 1, 5 );
- 		
- 		$w{hbox2} = Gtk2::HBox -> new( 0, 5 );
-@@ -359,7 +367,7 @@ sub _buildGUI {
- 			
- 			$w{frGeometry} = Gtk2::Frame -> new( ' RDP Window size: ' );
- 			$w{hbox2} -> pack_start( $w{frGeometry}, 1, 1, 0 );
--			$w{frGeometry} -> set_tooltip_text( '[-g] : Amount of screen to use' );
-+			$w{frGeometry} -> set_tooltip_text( '[/size] : Amount of screen to use' );
- 				
- 				$w{hboxsize} = Gtk2::VBox -> new( 0, 5 );
- 				$w{frGeometry} -> add( $w{hboxsize} );
-@@ -369,7 +377,7 @@ sub _buildGUI {
- 					
- 					$w{chFullscreen} = Gtk2::RadioButton -> new_with_label( undef, 'Fullscreen' );
- 					$w{hboxfsebpc} -> pack_start( $w{chFullscreen}, 1, 1, 0 );
--					$w{chFullscreen} -> set_tooltip_text( '[-f] : Enable fullscreen mode (toggled at any time using Ctrl-Alt-Enter)' );
-+					$w{chFullscreen} -> set_tooltip_text( '[/f] : Enable fullscreen mode (toggled at any time using Ctrl-Alt-Enter)' );
- 					
- 					$w{chEmbed} = Gtk2::RadioButton -> new_with_label( $w{chFullscreen}, 'Embed in TAB(*)' );
- 					$w{hboxfsebpc} -> pack_start( $w{chEmbed}, 1, 1, 0 );
-@@ -381,7 +389,7 @@ sub _buildGUI {
- 					$w{hboxfsebpc} -> pack_start( $w{hbox69}, 1, 1, 0 );
- 						
- 						$w{chWidthHeight} = Gtk2::RadioButton -> new_with_label( $w{chFullscreen}, 'Width x Height:' );
--						$w{chWidthHeight} -> set_tooltip_text( '[-g WIDTHxHEIGHT] : Define a fixed WIDTH x HEIGHT geometry window' );
-+						$w{chWidthHeight} -> set_tooltip_text( '[/size:WIDTHxHEIGHT] : Define a fixed WIDTH x HEIGHT geometry window' );
- 						$w{hbox69} -> pack_start( $w{chWidthHeight}, 0, 1, 0 );
- 						
- 						$w{hboxWidthHeight} = Gtk2::HBox -> new( 0, 5 );
-@@ -397,7 +405,7 @@ sub _buildGUI {
- 					$w{hboxsize} -> pack_start( $w{hboxPercentage}, 0, 1, 0 );
- 						
- 						$w{chPercentage} = Gtk2::RadioButton -> new_with_label( $w{chFullscreen}, 'Screen percentage:' );
--						$w{chPercentage} -> set_tooltip_text( '[-g percentage%] : Amount of screen to use' );
-+						$w{chPercentage} -> set_tooltip_text( '[/size:percentage%] : Amount of screen to use' );
- 						$w{chPercentage} -> set_active( 1 );
- 						$w{hboxPercentage} -> pack_start( $w{chPercentage}, 0, 1, 0 );
- 						
-@@ -406,7 +414,7 @@ sub _buildGUI {
- 			
- 			$w{frKeyboard} = Gtk2::Frame -> new( 'Keyboard layout:' );
- 			$w{hbox2} -> pack_start( $w{frKeyboard}, 0, 1, 0 );
--			$w{frKeyboard} -> set_tooltip_text( '[-k] : Keyboard layout' );
-+			$w{frKeyboard} -> set_tooltip_text( '[/kbd] : Keyboard layout' );
- 				
- 				$w{entryKeyboard} = Gtk2::Entry -> new;
- 				$w{frKeyboard} -> add( $w{entryKeyboard} );
-@@ -426,7 +434,7 @@ sub _buildGUI {
- 		
- 		$w{frameRedirDisk} = Gtk2::Frame -> new( ' Disk redirects: ' );
- 		$w{vbox} -> pack_start( $w{frameRedirDisk}, 1, 1, 0 );
--		$w{frameRedirDisk} -> set_tooltip_text( '[-r disk:<8_chars_sharename>=<path>] : Redirects a <path> to the share \\tsclient\<8_chars_sharename> on the server' );
-+		$w{frameRedirDisk} -> set_tooltip_text( '[/drive:<8_chars_sharename>:<path>] : Redirects a <path> to the share \\tsclient\<8_chars_sharename> on the server' );
- 			
- 			$w{vbox_enesimo} = Gtk2::VBox -> new( 0, 0);
- 			$w{frameRedirDisk} -> add( $w{vbox_enesimo}, );
-diff --git a/lib/pac_conn b/lib/pac_conn
-index 3182976..01fd0cc 100755
---- a/lib/pac_conn
-+++ b/lib/pac_conn
-@@ -934,6 +934,9 @@ if ( defined $METHOD ) {
- 		} elsif ( $METHOD eq 'rdesktop' ) {
- 			$connection_cmd = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
- 			$connection_txt = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
-+		} elsif ( $METHOD =~ /^.*freerdp$/ ) {
-+			$connection_cmd = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /t:\"$TITLE\" /v:$IP:$PORT";
-+			$connection_txt = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /t:\"$TITLE\" /v:$IP:$PORT";
- 		} else {
- 			$connection_cmd = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT -T \"$TITLE\"";
- 			$connection_txt = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT -T \"$TITLE\"";
diff --git a/0002-xfreerdp-new-interface.patch b/0002-xfreerdp-new-interface.patch
deleted file mode 100644
index baac9d3472fa..000000000000
--- a/0002-xfreerdp-new-interface.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 63d5a65a267c75b266ac41ff583659ed86c4b509 Mon Sep 17 00:00:00 2001
-From: Andrea Fagiani <andfagiani@gmail.com>
-Date: Mon, 18 Apr 2016 16:48:11 +0200
-Subject: [PATCH] xfreerdp method: fix syntax for drive redirection
-
----
- lib/method/PACMethod_xfreerdp.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/method/PACMethod_xfreerdp.pm b/lib/method/PACMethod_xfreerdp.pm
-index 622c830..02adf90 100644
---- a/lib/method/PACMethod_xfreerdp.pm
-+++ b/lib/method/PACMethod_xfreerdp.pm
-@@ -221,7 +221,7 @@ sub _parseCfgToOptions {
- 		$opt =~ /^\+fonts$/go		and	$hash{fontSmooth}	= 1;
- 		$opt =~ /^-grab-keyboard$/go	and	$hash{noGrabKbd}	= 1;
- 		
--		while ( $opt =~ /^drive:(.+):(.+)/go )
-+		while ( $opt =~ /^drive:(.+),(.+)/go )
- 		{
- 			my %redir;
- 			$redir{redirDiskShare}	= $1;
-@@ -266,7 +266,7 @@ sub _parseOptionsToCfg {
- 	$txt .= ' +fonts' if $$hash{fontSmooth};
- 	$txt .= ' -grab-keyboard' if $$hash{noGrabKbd};
- 	
--	foreach my $redir ( @{ $$hash{redirDisk} } ) { $txt .= " /drive:$$redir{redirDiskShare}:$$redir{redirDiskPath}"; }
-+	foreach my $redir ( @{ $$hash{redirDisk} } ) { $txt .= " /drive:$$redir{redirDiskShare},$$redir{redirDiskPath}"; }
- 	
- 	return $txt;
- }
diff --git a/0003-xfreerdp-new-interface.patch b/0003-xfreerdp-new-interface.patch
deleted file mode 100644
index 843cb8f741b4..000000000000
--- a/0003-xfreerdp-new-interface.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/lib/pac_conn	2016-08-04 19:23:57.264676225 +0200
-+++ b/lib/pac_conn	2016-08-04 19:24:46.645082365 +0200
-@@ -929,8 +929,8 @@
- 			$connection_cmd = "$METHOD -X $$CFG{'tmp'}{'xid'} -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " $IP:$PORT";
- 			$connection_txt = "$METHOD -X $$CFG{'tmp'}{'xid'} -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " $IP:$PORT";
- 		} elsif ( defined $$CFG{'tmp'}{'xid'} ) {
--			$connection_cmd = "$METHOD -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT";
--			$connection_txt = "$METHOD -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT";
-+			$connection_cmd = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /v:$IP:$PORT";
-+			$connection_txt = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /v:$IP:$PORT";
- 		} elsif ( $METHOD eq 'rdesktop' ) {
- 			$connection_cmd = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
- 			$connection_txt = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
diff --git a/0004-xfreerdp-new-interface.patch b/0004-xfreerdp-new-interface.patch
deleted file mode 100644
index a2135aab7211..000000000000
--- a/0004-xfreerdp-new-interface.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 794889803f749a94bb885b59c62826628ec577e9 Mon Sep 17 00:00:00 2001
-From: Andrea Fagiani <andfagiani@gmail.com>
-Date: Sun, 9 Oct 2016 21:44:15 +0200
-Subject: [PATCH] fix the sound option
-
----
- lib/method/PACMethod_xfreerdp.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/method/PACMethod_xfreerdp.pm b/lib/method/PACMethod_xfreerdp.pm
-index 02adf90..3b53aa0 100644
---- a/lib/method/PACMethod_xfreerdp.pm
-+++ b/lib/method/PACMethod_xfreerdp.pm
-@@ -254,7 +254,7 @@ sub _parseOptionsToCfg {
- 	$txt .= ' /shell ' . $$hash{startupshell} if $$hash{startupshell} ne '';
- 	$txt .= ' /d:' . $$hash{domain} if $$hash{domain} ne '';
- 	$txt .= ' +clipboard' if $$hash{redirClipboard};
--	$txt .= ' +sound:sys:alsa' if $$hash{redirSound};
-+        $txt .= ' /sound:sys:alsa' if $$hash{redirSound};
- 	$txt .= ' /cert-ignore' if $$hash{ignoreCert};
- 	$txt .= ' -authentication' if $$hash{noAuth};
- 	$txt .= ' -fast-path' if $$hash{nofastPath};
diff --git a/PKGBUILD b/PKGBUILD
index 01fe38e0b52b..15ab0ce08063 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=pacmanager-git
 _pkgname=${pkgname%-git}
 pkgver=4.5.5.8
-pkgrel=7
+pkgrel=8
 arch=('any')
 license=('GPL3')
 pkgdesc="Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface."
@@ -13,36 +13,15 @@ depends=('gconf-perl' 'glade-perl' 'openssh' 'perl-crypt-blowfish' 'perl-gnome2-
 makedepends=('git')
 conflicts=(pacmanager-bin)
 source=("git+https://github.com/perseo22/pacmanager.git"
-       "0001-xfreerdp-new-interface.patch"
-       "0002-xfreerdp-new-interface.patch"
-       "0003-xfreerdp-new-interface.patch"
-       "0004-xfreerdp-new-interface.patch"
-       "bugfix_ctrl-tab_in_last-focused_mode.patch"
        "fix_xfreerdp_embed_window.patch")
 sha256sums=('SKIP'
-            '98ab734e299083913b7d9f23dff047c3cc18bfc704e851b501930229c31f4d0a'
-            'e2a169dd9267cde0eb426c3de470a584aeb5d96d5dc1ee038532b9e03abedb73'
-            'dda5927251b70cc70e4a0590136b1b38aa5e85d490f7babf6fdf06391518892d'
-            'd65a594621469929f5f9f121074e37e048003b91119bda10d56909fa73b5c735'
-            '1396ce5405269093053c21d5673dee61ab1f9a313000490a2c413a561040c151'
             '678379ca96a59434ec623ecff8765969fcda5d41bc540ff5a587471c3e217b0e')
 
 prepare() {
 	cd ${srcdir}/${_pkgname}
 
-	# Apply patches for new FreeRDP interface (thanks to hador / https://github.com/hador/pacmanager )
-	patch -Np1 -i $srcdir/0001-xfreerdp-new-interface.patch
-	patch -Np1 -i $srcdir/0002-xfreerdp-new-interface.patch
-	# The third patch is done by me
-	patch -Np1 -i $srcdir/0003-xfreerdp-new-interface.patch
-        # A small bugfix from hador: https://github.com/hador/pacmanager/commit/794889803f749a94bb885b59c62826628ec577e9
-        patch -Np1 -i $srcdir/0004-xfreerdp-new-interface.patch
-
-	# Patch to fix ctrl-tab in last-focused mode (thanks to merikz / https://github.com/merikz/pacmanager/commit/ec861a8ba1f35070ea70496dd9d18976cfa6cca3 )
-	patch -Np1 -i $srcdir/bugfix_ctrl-tab_in_last-focused_mode.patch
-
 	# Ugly fix to fix xfreerdp embed window
-	patch -Np1 -i $srcdir/fix_xfreerdp_embed_window.patch
+#	patch -Np1 -i $srcdir/fix_xfreerdp_embed_window.patch
 }
 
 build() {
diff --git a/bugfix_ctrl-tab_in_last-focused_mode.patch b/bugfix_ctrl-tab_in_last-focused_mode.patch
deleted file mode 100644
index 72ff8238c155..000000000000
--- a/bugfix_ctrl-tab_in_last-focused_mode.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ec861a8ba1f35070ea70496dd9d18976cfa6cca3 Mon Sep 17 00:00:00 2001
-From: Merikz <merikz.code@gmail.com>
-Date: Sun, 20 Mar 2016 19:55:47 +0100
-Subject: [PATCH] bugfix: ctrl-tab in last-focused mode
-
-When active tab was changed by mouse, ctrl-tab did not go to correct tab.
-The mouse click did not update the meaning of "previous" tab.
-
-Fixes: #1
----
- lib/PACMain.pm | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/lib/PACMain.pm b/lib/PACMain.pm
-index d8dbe87..29b4eef 100644
---- a/lib/PACMain.pm
-+++ b/lib/PACMain.pm
-@@ -1810,7 +1810,6 @@ sub _setupCallbacks {
- 			
- 			if ( $$self{_CFG}{defaults}{'ctrl tab'} eq 'last' ) {
- 				$$self{_GUI}{nb} -> set_current_page( $$self{_PREVTAB} );
--				$$self{_PREVTAB} = $curr_page;
- 			} else {
- 				if ( $curr_page == 0 )	{ $$self{_GUI}{nb} -> set_current_page( $$self{_GUI}{nb} -> get_n_pages - 1 ); }
- 				else					{ $$self{_GUI}{nb} -> prev_page; }
-@@ -1821,26 +1820,22 @@ sub _setupCallbacks {
- 		elsif ( $ctrl && ( ! $$self{_CFG}{'defaults'}{'disable CTRL key bindings'} ) ) {
- 			# Capture <Ctrl>PgUp/Left --> select previous tab
- 			if ( $keyval eq 'Page_Up' && ! $$self{_CFG}{'defaults'}{'how to switch tabs'} ) {
--				$$self{_PREVTAB} = $curr_page;
- 				if ( $curr_page == 0 )	{ $$self{_GUI}{nb} -> set_current_page( -1 ); }
- 				else					{ $$self{_GUI}{nb} -> prev_page; }
- 			}
- 			# Capture <Ctrl>PgDwn/Right --> select next tab
- 			elsif ( $keyval eq 'Page_Down' && ! $$self{_CFG}{'defaults'}{'how to switch tabs'} ) {
--				$$self{_PREVTAB} = $curr_page;
- 				if ( $curr_page == $$self{_GUI}{nb} -> get_n_pages - 1 )	{ $$self{_GUI}{nb} -> set_current_page( 0 ); }
- 				else														{ $$self{_GUI}{nb} -> next_page; }
- 			}
- 			# Capture <Ctrl>number --> select number tab
- 			elsif ( $keyval =~ /^\d$/go ) {
--				$$self{_PREVTAB} = $curr_page;
- 				$$self{_GUI}{nb} -> set_current_page( $keyval - ( $$self{_CFG}{'defaults'}{'tabs in main window'} ? 0 : 1 ) );
- 			}
- 			# Capture <Ctrl>TAB --> switch between tabs
- 			elsif ( $keyval eq 'Tab' ) {
- 				if ( $$self{_CFG}{defaults}{'ctrl tab'} eq 'last' ) {
- 					$$self{_GUI}{nb} -> set_current_page( $$self{_PREVTAB} );
--					$$self{_PREVTAB} = $curr_page;
- 				} else {
- 					if ( $curr_page == $$self{_GUI}{nb} -> get_n_pages - 1 )	{ $$self{_GUI}{nb} -> set_current_page( 0 ); }
- 					else														{ $$self{_GUI}{nb} -> next_page; }
-@@ -1852,13 +1847,11 @@ sub _setupCallbacks {
- 		} elsif ( $alt && ( ! $$self{_CFG}{'defaults'}{'disable ALT key bindings'} ) && $$self{_CFG}{'defaults'}{'how to switch tabs'} ) {
- 			# Capture <Alt>PgUp/Left --> select previous tab
- 			if ( $keyval eq 'Left' ) {
--				$$self{_PREVTAB} = $curr_page;
- 				if ( $curr_page == 0 )	{ $$self{_GUI}{nb} -> set_current_page( -1 ); }
- 				else					{ $$self{_GUI}{nb} -> prev_page; }
- 			}
- 			# Capture <Alt>PgDwn/Right --> select next tab
- 			elsif ( $keyval eq 'Right' ) {
--				$$self{_PREVTAB} = $curr_page;
- 				if ( $curr_page == $$self{_GUI}{nb} -> get_n_pages - 1 )	{ $$self{_GUI}{nb} -> set_current_page( 0 ); }
- 				else														{ $$self{_GUI}{nb} -> next_page; }
- 			} else { return 0; }
-@@ -1904,6 +1897,8 @@ sub _setupCallbacks {
- 		#if ( $pnum == 0 && $$self{_CFG}{defaults}{'tabs in main window'} && $$self{'_CFG'}{'defaults'}{'auto hide connections list'} ) { $$self{_GUI}{showConnBtn} -> set_active( 1 ); }
- 		#elsif ( $$self{_CFG}{defaults}{'tabs in main window'} && $$self{'_CFG'}{'defaults'}{'auto hide connections list'} ) { $$self{_GUI}{showConnBtn} -> set_active( 0 ); }
- 		
-+		$$self{_PREVTAB}=$nb->get_current_page;
-+
- 		my $tab_page = $nb -> get_nth_page( $pnum );
- 		
- 		$$self{_HAS_FOCUS} = '';