From ff2f40c00245b2d07e6484b1f74cde589a2604ed Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 29 Jan 2010 11:17:57 +0100
Subject: [PATCH] fix for: 	-tunnel button disable when phone number is
 empty 	-axtel button status not acurate 	-console windows cannot be
 cleared

---
 Classes/ConsoleViewController.h   |   1 -
 Classes/ConsoleViewController.m   |   9 +-
 Classes/ConsoleViewController.xib | 140 +++++++++++++++---------------
 Classes/PhoneViewController.m     |  10 +--
 Classes/linphoneAppDelegate.m     |   1 +
 5 files changed, 78 insertions(+), 83 deletions(-)

diff --git a/Classes/ConsoleViewController.h b/Classes/ConsoleViewController.h
index a7181c721..090604fb0 100644
--- a/Classes/ConsoleViewController.h
+++ b/Classes/ConsoleViewController.h
@@ -26,7 +26,6 @@
 }
 -(void) doAction;
 @property (nonatomic, retain) IBOutlet UITextView* logs;
-@property (nonatomic, retain) IBOutlet UIButton* clear;
 @property (nonatomic, retain) IBOutlet UIView*	logsView;
 
 
diff --git a/Classes/ConsoleViewController.m b/Classes/ConsoleViewController.m
index fe0274112..722b08289 100644
--- a/Classes/ConsoleViewController.m
+++ b/Classes/ConsoleViewController.m
@@ -34,10 +34,11 @@ NSMutableString* MoreViewController_logs;
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
     [super viewDidLoad];
-	UIBarButtonItem* clear = [[UIBarButtonItem alloc] initWithCustomView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"bot_borrar1.png"]]];
-	[clear setTarget:self];
-	[clear setAction:@selector(doAction)];
-	[self.navigationItem setRightBarButtonItem:clear];
+	UIBarButtonItem* clear = [[UIBarButtonItem alloc] 
+							  initWithBarButtonSystemItem:UIBarButtonSystemItemTrash 
+							  target:self 
+							  action:@selector(doAction)]; 
+		[self.navigationItem setRightBarButtonItem:clear];
 }
 
 
diff --git a/Classes/ConsoleViewController.xib b/Classes/ConsoleViewController.xib
index 8087014af..16846dae6 100644
--- a/Classes/ConsoleViewController.xib
+++ b/Classes/ConsoleViewController.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
+			<integer value="10"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -31,56 +31,44 @@
 			<object class="IBProxyObject" id="975951072">
 				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIView" id="679133499">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUITextView" id="249557632">
-								<reference key="NSNextResponder" ref="679133499"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrame">{{0, 50}, {320, 450}}</string>
-								<reference key="NSSuperview" ref="679133499"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MSAxIDEAA</bytes>
-								</object>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<bool key="IBUIMultipleTouchEnabled">YES</bool>
-								<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-								<bool key="IBUIDelaysContentTouches">NO</bool>
-								<bool key="IBUICanCancelContentTouches">NO</bool>
-								<bool key="IBUIBouncesZoom">NO</bool>
-								<bool key="IBUIEditable">NO</bool>
-								<string key="IBUIText"/>
-								<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-									<int key="IBUIAutocapitalizationType">2</int>
-								</object>
+			<object class="IBUIViewController" id="962557183">
+				<object class="IBUIView" key="IBUIView" id="679133499">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">292</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="IBUITextView" id="249557632">
+							<reference key="NSNextResponder" ref="679133499"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrameSize">{320, 450}</string>
+							<reference key="NSSuperview" ref="679133499"/>
+							<object class="NSColor" key="IBUIBackgroundColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MSAxIDEAA</bytes>
+							</object>
+							<bool key="IBUIClipsSubviews">YES</bool>
+							<bool key="IBUIMultipleTouchEnabled">YES</bool>
+							<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+							<bool key="IBUIDelaysContentTouches">NO</bool>
+							<bool key="IBUICanCancelContentTouches">NO</bool>
+							<bool key="IBUIBouncesZoom">NO</bool>
+							<bool key="IBUIEditable">NO</bool>
+							<string key="IBUIText"/>
+							<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+								<int key="IBUIAutocapitalizationType">2</int>
 							</object>
 						</object>
-						<string key="NSFrameSize">{320, 460}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="853965922">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 					</object>
-				</object>
-				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<reference key="NSCustomColorSpace" ref="853965922"/>
+					<string key="NSFrameSize">{320, 460}</string>
+					<reference key="NSSuperview"/>
+					<object class="NSColor" key="IBUIBackgroundColor">
+						<int key="NSColorSpace">3</int>
+						<bytes key="NSWhite">MQA</bytes>
+						<object class="NSColorSpace" key="NSCustomColorSpace">
+							<int key="NSID">2</int>
+						</object>
+					</object>
+					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 				</object>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 			</object>
@@ -88,14 +76,6 @@
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">logs</string>
@@ -104,6 +84,22 @@
 					</object>
 					<int key="connectionID">9</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">logsView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="679133499"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="679133499"/>
+					</object>
+					<int key="connectionID">14</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -116,15 +112,6 @@
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="679133499"/>
-						</object>
-						<reference key="parent" ref="732835941"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
 						<reference key="object" ref="372490531"/>
@@ -136,6 +123,15 @@
 						<reference key="object" ref="975951072"/>
 						<reference key="parent" ref="732835941"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="962557183"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="679133499"/>
+						</object>
+						<reference key="parent" ref="732835941"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
 						<reference key="object" ref="679133499"/>
@@ -143,7 +139,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="249557632"/>
 						</object>
-						<reference key="parent" ref="191373211"/>
+						<reference key="parent" ref="962557183"/>
 						<string key="objectName">logView</string>
 					</object>
 					<object class="IBObjectRecord">
@@ -159,8 +155,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
 					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
+					<string>10.CustomClassName</string>
+					<string>10.IBEditorWindowLastContentRect</string>
+					<string>10.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 				</object>
@@ -168,7 +165,8 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>ConsoleViewController</string>
 					<string>UIResponder</string>
-					<string>{{556, 412}, {320, 480}}</string>
+					<string>ConsoleViewController</string>
+					<string>{{807, 300}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -194,7 +192,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">9</int>
+			<int key="maxID">14</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -206,13 +204,11 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>clear</string>
 							<string>logs</string>
 							<string>logsView</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIButton</string>
 							<string>UITextView</string>
 							<string>UIView</string>
 						</object>
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index c6ecb07e3..a9744aa65 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -71,10 +71,10 @@
 //implements call/cancel button behavior 
 -(IBAction) doAction:(id)sender {
 	//1 normalize phone number
-	if ([address.text length] == 0) return; //just return
 	
 	if (sender == gsmCall || sender == call) {
-		
+
+		if ([address.text length] == 0) return; //just return
 		char normalizedUserName[256];
 		LinphoneProxyConfig* proxyCfg;	
 		//get default proxy
@@ -342,10 +342,7 @@
 	//	GSTATE_CALL_ERROR,
 	//	GSTATE_INVALID
 	switch (state->new_state) {
-		case GSTATE_REG_FAILED: {
-			[self enableCall:false];
-			break;
-		}
+		case GSTATE_REG_FAILED: 
 		case GSTATE_REG_OK: {
 			LinphoneProxyConfig* proxyCfg;	
 			//get default proxy
@@ -391,6 +388,7 @@
 		case GSTATE_CALL_END: {
 			//end off call, just dismiss Incall view
 			[self dismissIncallView];
+			[myIncallViewController resetView];
 			displayName=@"";
 			break;
 		}
diff --git a/Classes/linphoneAppDelegate.m b/Classes/linphoneAppDelegate.m
index 183843e73..e724caa16 100644
--- a/Classes/linphoneAppDelegate.m
+++ b/Classes/linphoneAppDelegate.m
@@ -550,6 +550,7 @@ bool networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 
 -(void) doRegister {
 	SCNetworkReachabilityFlags reachabilityFlags;
+	SCNetworkReachabilityGetFlags (proxyReachability,&reachabilityFlags);
 	networkReachabilityCallBack(proxyReachability,reachabilityFlags,myLinphoneCore); 
 }
 -(LinphoneCore*) getLinphoneCore {