From 7185c8a8fe5d570bf63fd76cd2c7609f8fe6031e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benoi=CC=82t=20LeBlanc?= <benoit.leblanc@awakecoding.com>
Date: Thu, 20 Jun 2013 16:45:27 -0400
Subject: [PATCH] mac client: Set clipboard redirection ON by default, small
 refactoring

---
 client/Mac/MRDPView.m  | 9 +++++++--
 client/Mac/mf_client.m | 9 +--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index 806d1a77c..29c5dfd34 100644
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -133,9 +133,14 @@ struct rgba_data
 
     context->instance->PreConnect = mac_pre_connect;
 	context->instance->PostConnect = mac_post_connect;
-	context->instance->ReceiveChannelData = receive_channel_data;
+    context->instance->ReceiveChannelData = mac_receive_channel_data;
 	context->instance->Authenticate = mac_authenticate;
 
+// TODO
+//    instance->Authenticate = mf_authenticate;
+//    instance->VerifyCertificate = mf_verify_certificate;
+//    instance->LogonErrorInfo = mf_logon_error_info;
+
     status = freerdp_client_start(context);
 	
     if (status)
@@ -1266,7 +1271,7 @@ int register_channels_fds(freerdp* instance)
  * called when channel data is available
  ***********************************************************************/
 
-int receive_channel_data(freerdp* instance, int chan_id, BYTE* data, int size, int flags, int total_size)
+int mac_receive_channel_data(freerdp* instance, int chan_id, BYTE* data, int size, int flags, int total_size)
 {
 	return freerdp_channels_data(instance, chan_id, data, size, flags, total_size);
 }
diff --git a/client/Mac/mf_client.m b/client/Mac/mf_client.m
index 3bf41810c..7d9ca4d1f 100755
--- a/client/Mac/mf_client.m
+++ b/client/Mac/mf_client.m
@@ -88,14 +88,6 @@ int mfreerdp_client_new(freerdp* instance, rdpContext* context)
 
     mfc = (mfContext*) instance->context;
 
-    // TODO
-//    instance->PreConnect = mf_pre_connect;
-//    instance->PostConnect = mf_post_connect;
-//    instance->Authenticate = mf_authenticate;
-//    instance->VerifyCertificate = mf_verify_certificate;
-//    instance->LogonErrorInfo = mf_logon_error_info;
-//    instance->ReceiveChannelData = mf_receive_channel_data;
-
     context->channels = freerdp_channels_new();
 
     settings = instance->settings;
@@ -104,6 +96,7 @@ int mfreerdp_client_new(freerdp* instance, rdpContext* context)
     // TODO    settings->AsyncInput = TRUE;
     settings->AsyncChannels = TRUE;
     settings->AsyncTransport = TRUE;
+    settings->RedirectClipboard = TRUE;
 
     settings->OsMajorType = OSMAJORTYPE_MACINTOSH;
     settings->OsMinorType = OSMINORTYPE_MACINTOSH;