Re: [Libreoffice-commits] core.git: 3 commits - ios/iosremote sw/source

2013-10-06 Thread Miklos Vajna 
On Sat, Oct 05, 2013 at 03:35:02AM -0700, Siqi LIU m...@siqi.fr wrote:
  sw/source/filter/ww8/docxattributeoutput.cxx |   
  4 

Hi,

Sorry, I had to revert this part; it made CppunitTest_sw_ooxmlexport
fail. Have you tried running a toplevel 'make' before pushing?

On OS X, you'll need to remove the platform-specific ifdef from
sw/qa/extras/ooxmlexport/ooxmlexport.cxx to have the test fail (AFAIK
it's disabled by default as it causes some popup windows).

If you have an idea what's the problem with your patch, of course we can
consider its updated version again,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - ios/iosremote

2013-08-30 Thread Siqi LIU 
 dev/null |binary
 ios/iosremote/.DS_Store  |binary
 ios/iosremote/fr.lproj/iPad_autosize_old.storyboard  |4 ++--
 ios/iosremote/iosremote.xcodeproj/project.pbxproj|   12 
 ios/iosremote/iosremote/WTcontrol~ipad.png   |binary
 ios/iosremote/iosremote/WTcontrol~iphone.png |binary
 ios/iosremote/iosremote/WalkThroughPageViewController.m  |5 -
 ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++--
 8 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 756b6040ca24702cca2482086e358080e20eb6d2
Author: Siqi LIU m...@siqi.fr
Date:   Fri Aug 30 16:16:51 2013 +0200

remove old WalkthroughControl image

Change-Id: Id5680fde392a731da15889d3869e234fbf072068

diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store
index a75cbd5..85b6552 100644
Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj 
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index d5cf0ab..c5770a0 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -105,6 +105,8 @@
8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = 
{isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; 
};
8CAD659D17A3EFE700CFB661 /* arrow_ri...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png 
*/; };
8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* 
slideShowSwipeInList_ipad.m */; };
+   8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png 
*/; };
+   8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = 8CAF3DDE17D0DFFD00F931E5 /* 
WTcontrol~iphone.png */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /* 
WalkThroughPageViewController.m */; };
8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib 
in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* 
WalkThroughPageViewController.xib */; };
8CD6EC7017CC3FA00071827A /* 
WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile; 
fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */; 
};
@@ -117,7 +119,6 @@
8CD6EC8217CF40200071827A /* WTconnecting.png in Resources */ = 
{isa = PBXBuildFile; fileRef = 8CD6EC8117CF40200071827A /* WTconnecting.png */; 
};
8CD6EC8417CF46930071827A /* WTPairing.png in Resources */ = 
{isa = PBXBuildFile; fileRef = 8CD6EC8317CF46930071827A /* WTPairing.png */; };
8CD6EC8817CF4ABA0071827A /* 
WalkThroughPageViewMainImageController.xib in Resources */ = {isa = 
PBXBuildFile; fileRef = 8CD6EC8717CF4ABA0071827A /* 
WalkThroughPageViewMainImageController.xib */; };
-   8CD6EC8A17CF67300071827A /* WTcontrol.png in Resources */ = 
{isa = PBXBuildFile; fileRef = 8CD6EC8917CF67300071827A /* WTcontrol.png */; };
BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* 
CoreImage.framework */; };
 /* End PBXBuildFile section */
 
@@ -272,6 +273,8 @@
8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = arrow_ri...@2x.png; 
path = iosremote/arrow_ri...@2x.png; sourceTree = group; };
8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
name = slideShowSwipeInList_ipad.h; path = 
iosremote/slideShowSwipeInList_ipad.h; sourceTree = group; };
8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = 
iosremote/slideShowSwipeInList_ipad.m; sourceTree = group; };
+   8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~ipad.png; 
path = iosremote/WTcontrol~ipad.png; sourceTree = group; };
+   8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~iphone.png; 
path = iosremote/WTcontrol~iphone.png; sourceTree = group; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =

[Libreoffice-commits] core.git: 3 commits - ios/iosremote sdext/source sd/source

2013-07-18 Thread Siqi LIU 
 ios/iosremote/iosremote/Communication/Client.m   |2 
 ios/iosremote/iosremote/Communication/CommandTransmitter.h   |2 
 ios/iosremote/iosremote/Communication/CommandTransmitter.m   |5 
 ios/iosremote/iosremote/Communication/CommunicationManager.m |   28 +++-
 ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard  |   63 ---
 ios/iosremote/iosremote/slideShow_vc.m   |5 
 sd/source/ui/remotecontrol/Receiver.cxx  |9 +
 sdext/source/presenter/PresenterController.cxx   |2 
 8 files changed, 43 insertions(+), 73 deletions(-)

New commits:
commit 1bf276ba6e0486bc8ccc74a219dd2db8acfcff03
Author: Siqi LIU m...@siqi.fr
Date:   Thu Jul 18 21:45:55 2013 +0200

add pointer in receiver...but don't know how to draw that point

Change-Id: I49493e87a0dab66a6b5abeb086afb51f5631b456

diff --git a/sd/source/ui/remotecontrol/Receiver.cxx 
b/sd/source/ui/remotecontrol/Receiver.cxx
index c3fe6fc..b5f06e7 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -119,6 +119,15 @@ void Receiver::executeCommand( const std::vectorOString 
aCommand )
 xSlideShowController-blankScreen( aColour );
 }
 }
+// pointer_coordination
+// x
+// y
+else if (aCommand[0].equals( pointer_coordination ))
+{
+float x = aCommand[1].toFloat();
+float y = aCommand[2].toFloat();
+std::cerr  (x,y) std::endl;
+}
 else if ( aCommand[0].equals( presentation_resume ) )
 {
 if ( xSlideShowController.is() )
commit 0025dd19c997d121c82c54a5af546256de32d413
Author: Siqi LIU m...@siqi.fr
Date:   Thu Jul 18 21:41:22 2013 +0200

Ask users to reconnect if connection lost

Change-Id: I8b2da585e506e6ff529e0650c27429bb460185c8

diff --git a/ios/iosremote/iosremote/Communication/Client.m 
b/ios/iosremote/iosremote/Communication/Client.m
index 4416986..4ad51f8 100644
--- a/ios/iosremote/iosremote/Communication/Client.m
+++ b/ios/iosremote/iosremote/Communication/Client.m
@@ -214,9 +214,7 @@ int count = 0;
 } break;
 default:
 {
-
 }
-
 }
 }
 
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.h 
b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
index 95821c9..f0243b3 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.h
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.h
@@ -27,4 +27,6 @@
 - (void) startPresentation;
 - (void) stopPresentation;
 
+- (void) pointerCoordination:(CGPoint) aPoint;
+
 @end
diff --git a/ios/iosremote/iosremote/Communication/CommandTransmitter.m 
b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
index a359f5e..07cdc9a 100644
--- a/ios/iosremote/iosremote/Communication/CommandTransmitter.m
+++ b/ios/iosremote/iosremote/Communication/CommandTransmitter.m
@@ -43,6 +43,11 @@
 [self.client sendCommand:[NSString stringWithFormat:@goto_slide\n%u\n\n, 
slide]];
 }
 
+- (void) pointerCoordination:(CGPoint) aPoint
+{
+[self.client sendCommand:[NSString 
stringWithFormat:@pointer_coordination\n%f\n%f\n\n, aPoint.x, aPoint.y]];
+}
+
 
 /**
  * Blank the screen to the default colour (set server-side), which is
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m 
b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index 5538736..199f69c 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -59,14 +59,26 @@
 if (self.state != DISCONNECTED) {
 NSLog(@Connection Failed);
 self.state = DISCONNECTED;
-dispatch_async(dispatch_get_main_queue(), ^{
-UIAlertView *message = [[UIAlertView alloc] 
initWithTitle:@Failed to reach server
-  
message:@Please verify your IP address and make sure that LibreOffice Impress 
is running with impress remote feature enabled. 
- delegate:self
-cancelButtonTitle:@OK
-
otherButtonTitles:@Help, nil];
-[message show];
-});
+if ([self.delegate isKindOfClass:[server_list_vc class]]){
+dispatch_async(dispatch_get_main_queue(), ^{
+UIAlertView *message = [[UIAlertView alloc] 
initWithTitle:@Failed to reach server
+  
message:@Please verify your IP address and make sure that LibreOffice Impress 
is running with impress remote feature enabled. 
+ 
delegate:self
+

[Libreoffice-commits] core.git: 3 commits - ios/iosremote

2013-07-15 Thread siqi 
 ios/iosremote/.DS_Store  |binary
 ios/iosremote/ic_launcher.psd|binary
 ios/iosremote/iosremote/Communication/CommunicationManager.m |   40 +++
 3 files changed, 29 insertions(+), 11 deletions(-)

New commits:
commit a2e2873ac39a7882b1c596b12c402504ffb5a4d8
Author: siqi m...@siqi.fr
Date:   Mon Jul 15 12:59:06 2013 +0200

help button

diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store
index 24bebe4..c8e6f9f 100644
Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m 
b/ios/iosremote/iosremote/Communication/CommunicationManager.m
index 306b6c9..5538736 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.m
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m
@@ -18,7 +18,7 @@
 
 #define ExistingServersKey @CommunicationManager.ExistingServers
 
-@interface CommunicationManager()
+@interface CommunicationManager() UIAlertViewDelegate
 @end
 
 // Singlton Pattern
@@ -49,7 +49,7 @@
 if([[note name] isEqualToString:@connection.status.connected]){
 if (self.state!=CONNECTED){
 NSLog(@Connected, waiting for pairing response);
-// A 5 seconds timer waiting for pairing response. 
+// A 5 seconds timer waiting for pairing response.
 [self.client startConnectionTimeoutTimerwithInterval:5.0];
 self.transmitter = [[CommandTransmitter alloc] 
initWithClient:self.client];
 }
@@ -61,8 +61,8 @@
 self.state = DISCONNECTED;
 dispatch_async(dispatch_get_main_queue(), ^{
 UIAlertView *message = [[UIAlertView alloc] 
initWithTitle:@Failed to reach server
-  
message:@Please verify the IP address and try again later
- delegate:nil
+  
message:@Please verify your IP address and make sure that LibreOffice Impress 
is running with impress remote feature enabled. 
+ delegate:self
 cancelButtonTitle:@OK
 
otherButtonTitles:@Help, nil];
 [message show];
@@ -71,6 +71,24 @@
 }
 }
 
+- (void)alertView:(UIAlertView *)alertView 
clickedButtonAtIndex:(NSInteger)buttonIndex{
+if (buttonIndex == 0){
+[alertView dismissWithClickedButtonIndex:0 animated:YES];
+}else if (buttonIndex == 1){
+[alertView dismissWithClickedButtonIndex:0 animated:YES];
+UIAlertView *message = [[UIAlertView alloc] initWithTitle:@Pairing 
instructions
+  message:@1. Launch 
your LibreOffice Impress on your Computer\n\n
+@2. Enable Preferences - LibreOffice Impress 
- General - Enable remote control\n\n
+@3. Enable Preferences - LibreOffice Impress 
- Advanced - Enable Experimental Features\n\n
+@4. Make sure your Computer and your device 
are connected to the same WiFi network and Enter your Computer's IP address\n\n
+@5. Connect and Enjoy!\n\n
+ delegate:nil
+cancelButtonTitle:@OK
+otherButtonTitles:nil];
+[message show];
+}
+}
+
 - (id) init
 {
 self = [super init];
@@ -108,7 +126,7 @@
 self.servers = [[NSMutableArray alloc] 
initWithArray:oldSavedArray];
 else
 self.servers = [[NSMutableArray alloc] init];
-} 
+}
 return self;
 }
 
@@ -117,12 +135,12 @@
 if (self.state == CONNECTING) {
 return;
 } else {
-[self.client disconnect];
-self.state = CONNECTING;
-// initialise it with a given server
-self.client = [[Client alloc]initWithServer:server managedBy:self 
interpretedBy:self.interpreter];
-self.transmitter = [[CommandTransmitter alloc] 
initWithClient:self.client];
-[self.client connect];
+[self.client disconnect];
+self.state = CONNECTING;
+// initialise it with a given server
+self.client = [[Client alloc]initWithServer:server managedBy:self 
interpretedBy:self.interpreter];
+self.transmitter = [[CommandTransmitter alloc] 
initWithClient:self.client];
+[self.client connect];
 }
 }
 
commit bd3bbccd59e0f7b67d4082228fe45bfa763fc3f4
Author: siqi m...@siqi.fr
Date:   Mon Jul 15 12:54:40 2013 +0200

icon psd

diff --git a/ios/iosremote/ic_launcher.psd b/ios/iosremote/ic_launcher.psd
new

[Libreoffice-commits] core.git: 3 commits - ios/iosremote

2013-07-10 Thread siqi 
 ios/iosremote/iosremote.xcodeproj/project.pbxproj  
  |   12 
 
ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
 |binary
 
ios/iosremote/iosremote.xcodeproj/xcuserdata/siqi.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  |   26 
 ios/iosremote/iosremote/Communication/Client.m 
  |   41 
 ios/iosremote/iosremote/Communication/CommandInterpreter.m 
  |   46 
 ios/iosremote/iosremote/Communication/SlideShow.m  
  |9 
 ios/iosremote/iosremote/Communication/pinValidation_vc.h   
  |   14 
 ios/iosremote/iosremote/Communication/pinValidation_vc.m   
  |   14 
 ios/iosremote/iosremote/SWReavealMainController.h  
  |   14 
 ios/iosremote/iosremote/SWReavealMainController.m  
  |   14 
 ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard  
  |  783 --
 ios/iosremote/iosremote/en.lproj/iPhone_autolayout.storyboard  
  |  783 ++
 ios/iosremote/iosremote/iosremote-Info.plist   
  |5 
 ios/iosremote/iosremote/main.m 
  |   14 
 ios/iosremote/iosremote/newServer_vc.h 
  |   12 
 ios/iosremote/iosremote/newServer_vc.m 
  |   77 
 ios/iosremote/iosremote/serverList_vc.m
  |   12 
 ios/iosremote/iosremote/slideShowPreviewTable_vc.h 
  |   14 
 ios/iosremote/iosremote/slideShowPreviewTable_vc.m 
  |   18 
 ios/iosremote/iosremote/slideShowPreview_vc.h  
  |   14 
 ios/iosremote/iosremote/slideShowPreview_vc.m  
  |   16 
 ios/iosremote/iosremote/slideShowSwipeInList.h 
  |   15 
 ios/iosremote/iosremote/slideShowSwipeInList.m 
  |4 
 ios/iosremote/iosremote/slideShow_vc.h 
  |   14 
 ios/iosremote/iosremote/slideShow_vc.m 
  |   22 
 25 files changed, 980 insertions(+), 1013 deletions(-)

New commits:
commit 424bc075d0d03832759e69b4a4eb35ec2eab2174
Author: siqi m...@siqi.fr
Date:   Wed Jul 10 10:47:34 2013 +0200

continue to interpret command from server if is not ended

Change-Id: Id970a54db5c61a9cada6b1fda0c3cecdebb4ffe7

diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj 
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index bd13696..d35a80d 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -36,7 +36,7 @@
57C6E405175E06E800E8BC5F /* Default.png in Resources */ = {isa 
= PBXBuildFile; fileRef = 57C6E404175E06E800E8BC5F /* Default.png */; };
57C6E407175E06E800E8BC5F /* defa...@2x.png in Resources */ = 
{isa = PBXBuildFile; fileRef = 57C6E406175E06E800E8BC5F /* defa...@2x.png */; };
57C6E409175E06E800E8BC5F /* default-5...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 57C6E408175E06E800E8BC5F /* 
default-5...@2x.png */; };
-   57C6E40C175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard in 
Resources */ = {isa = PBXBuildFile; fileRef = 57C6E40A175E06E800E8BC5F /* 
MainStoryboard_iPhone.storyboard */; };
+   57C6E40C175E06E800E8BC5F /* iPhone_autolayout.storyboard in 
Resources */ = {isa = PBXBuildFile; fileRef = 57C6E40A175E06E800E8BC5F /* 
iPhone_autolayout.storyboard */; };
57C6E42E175E076900E8BC5F /* Client.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 57C6E427175E076900E8BC5F /* Client.m */; };
57C6E42F175E076900E8BC5F /* CommunicationManager.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 57C6E429175E076900E8BC5F /* 
CommunicationManager.m */; };
57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */ 
= {isa = PBXBuildFile; fileRef =

[Libreoffice-commits] core.git: 3 commits - ios/iosremote

2013-06-12 Thread siqi 
 ios/iosremote/iosremote/Base64.h|   33 ---
 ios/iosremote/iosremote/Base64.m|  100 
+
 ios/iosremote/iosremote/Communication/Client.h  |6 
 ios/iosremote/iosremote/Communication/Client.m  |   54 +++--
 ios/iosremote/iosremote/Communication/CommandInterpreter.m  |6 
 ios/iosremote/iosremote/Communication/CommandTransmitter.m  |6 
 ios/iosremote/iosremote/Communication/CommunicationManager.h|   15 +
 ios/iosremote/iosremote/Communication/CommunicationManager.m|  102 
++
 ios/iosremote/iosremote/Communication/Server.h  |2 
 ios/iosremote/iosremote/Communication/Server.m  |   17 +
 ios/iosremote/iosremote/Communication/SlideShow.h   |5 
 ios/iosremote/iosremote/Communication/SlideShow.m   |   22 +-
 ios/iosremote/iosremote/en.lproj/MainStoryboard_iPad.storyboard |   86 +++-
 ios/iosremote/iosremote/libreoffice_sdremoteViewController.m|   13 +
 ios/iosremote/iosremote/slideShowViewController.h   |6 
 ios/iosremote/iosremote/slideShowViewController.m   |   24 ++
 16 files changed, 345 insertions(+), 152 deletions(-)

New commits:
commit 651a96e3fde964164f80aa7c83af01168465aa2b
Author: siqi m...@siqi.fr
Date:   Wed Jun 12 09:01:15 2013 +0200

multithreading in comManager

diff --git a/ios/iosremote/iosremote/Communication/Client.h 
b/ios/iosremote/iosremote/Communication/Client.h
index 94fe6c7..45f7e95 100644
--- a/ios/iosremote/iosremote/Communication/Client.h
+++ b/ios/iosremote/iosremote/Communication/Client.h
@@ -13,11 +13,13 @@
 
 @interface Client : NSObject
 
-@property BOOL ready;
+@property BOOL connected;
 @property (nonatomic, strong) NSNumber* pin;
 @property (nonatomic, strong) NSString* name;
+@property (nonatomic, weak) Server* server;
 
--(void) connect;
+- (BOOL) connect;
+- (void) disconnect;
 
 - (id) initWithServer:(Server*)server
 managedBy:(CommunicationManager*)manager
diff --git a/ios/iosremote/iosremote/Communication/Client.m 
b/ios/iosremote/iosremote/Communication/Client.m
index 3b1f1b6..bfa7648 100644
--- a/ios/iosremote/iosremote/Communication/Client.m
+++ b/ios/iosremote/iosremote/Communication/Client.m
@@ -21,13 +21,12 @@
 
 @property uint mPort;
 
-@property (nonatomic, weak) Server* server;
 @property (nonatomic, weak) CommandInterpreter* receiver;
 @property (nonatomic, weak) CommunicationManager* comManager;
 
 @end
 
-
+NSCondition *connected;
 
 @implementation Client
 
@@ -37,7 +36,7 @@
 @synthesize name = _mName;
 @synthesize server = _mServer;
 @synthesize comManager = _mComManager;
-@synthesize ready = _mReady;
+@synthesize connected = _mReady;
 @synthesize receiver = _receiver;
 
 - (id) initWithServer:(Server*)server
@@ -47,7 +46,8 @@
 self = [self init];
 if (self)
 {
-self.ready = NO;
+connected = [NSCondition new];
+self.connected = NO;
 self.name = [[UIDevice currentDevice] name];
 self.pin = [NSNumber numberWithInteger:[self getPin]];
 self.server = server;
@@ -99,14 +99,6 @@
 [self.outputStream setDelegate:self];
 [self.outputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] 
forMode:NSDefaultRunLoopMode];
 [self.outputStream open];
-
-//NSLog(@Stream opened %@ %@, @iPad, self.mPin);
-
-NSArray *temp = [[NSArray 
alloc]initWithObjects:@LO_SERVER_CLIENT_PAIR\n, self.name, @\n, self.pin, 
@\n\n, nil];
-
-NSString *command = [temp componentsJoinedByString:@];
-
-[self sendCommand:command];
 }
 }
 
@@ -122,12 +114,22 @@
 - (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode {
 
 switch(eventCode) {
-case NSStreamEventOpenCompleted:
+case NSStreamEventOpenCompleted:{
 NSLog(@Connection established);
-self.ready = YES;
+[connected lock];
+NSArray *temp = [[NSArray 
alloc]initWithObjects:@LO_SERVER_CLIENT_PAIR\n, self.name, @\n, self.pin, 
@\n\n, nil];
+NSString *command = [temp componentsJoinedByString:@];
+[self sendCommand:command];
+self.connected = YES;
+[connected signal];
+[connected unlock];
+}
+
 break;
-case NSStreamEventErrorOccurred:
+case NSStreamEventErrorOccurred:{
 NSLog(@Connection error occured);
+[self disconnect];
+}
 break;
 case NSStreamEventHasBytesAvailable:
 {
@@ -153,7 +155,6 @@
 }
 
 NSArray *commands = [str componentsSeparatedByString:@\n];
-//NSLog(@Data Received: %@, commands);
 
 [self.receiver parse:commands];
 data = nil;
@@ -167,10 +168,29 @@
 }
 }
 
+- (void) disconnect
+{
+