From 528ace4edefcdc45a0b4d09b01dc37fa71d7ffa4 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 19 Oct 2012 10:40:56 +0200
Subject: [PATCH 1/3] french translation fix

---
 Classes/fr.lproj/ChatRoomViewController.xib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib
index abcf137a7..a9a24015c 100644
--- a/Classes/fr.lproj/ChatRoomViewController.xib
+++ b/Classes/fr.lproj/ChatRoomViewController.xib
@@ -260,7 +260,7 @@
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-											<string key="IBUIAccessibilityLabel">Envoyez</string>
+											<string key="IBUIAccessibilityLabel">Envoyer</string>
 										</object>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<bool key="IBUIEnabled">NO</bool>
@@ -272,7 +272,7 @@
 										<double key="IBUITitleEdgeInsets.bottom">0.0</double>
 										<double key="IBUITitleEdgeInsets.left">0.0</double>
 										<double key="IBUITitleEdgeInsets.right">0.0</double>
-										<string key="IBUINormalTitle">Envoyez</string>
+										<string key="IBUINormalTitle">Envoyer</string>
 										<object class="NSColor" key="IBUIHighlightedTitleColor">
 											<int key="NSColorSpace">2</int>
 											<bytes key="NSRGB">MCAwIDAAA</bytes>

From 55a792aeea0a9334b4336b021ca299ae9c1a1695 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 19 Oct 2012 11:03:19 +0200
Subject: [PATCH 2/3] disable GL drawing until state is Active

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index aa49870d7..353465b28 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit aa49870d7117df201ea56838f34fe651b458d0ee
+Subproject commit 353465b2850a7d8fa1be41e4859d22596b653464

From eda70942c429e863612f500fe2b8ed69db7964ae Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 19 Oct 2012 14:09:42 +0200
Subject: [PATCH 3/3] answer busy if incomming call while GSM call in progress

---
 Classes/LinphoneManager.m | 21 ++++++++++++++++++---
 submodules/linphone       |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index b6f101bb7..6490e6962 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -385,10 +385,24 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
     } else {
 		data = (LinphoneCallAppData*) linphone_call_get_user_pointer(call);
 	}
+
+	
 	if (state == LinphoneCallIncomingReceived
 		&&[[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
 		&& [UIApplication sharedApplication].applicationState !=  UIApplicationStateActive) {
-        LinphoneCallLog* callLog=linphone_call_get_call_log(call);
+        
+		/*first step is to re-enable ctcall center*/
+		[self setupGSMInteraction];
+		
+		/*should we reject this call ?*/
+		if ([callCenter currentCalls]!=nil) {
+			[LinphoneLogger logc:LinphoneLoggerLog format:"Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)];
+			linphone_core_decline_call([LinphoneManager getLc], call,LinphoneReasonBusy);
+			return;
+		}
+		
+		
+		LinphoneCallLog* callLog=linphone_call_get_call_log(call);
 		NSString* callId=[NSString stringWithUTF8String:callLog->call_id];
         const LinphoneAddress *addr = linphone_call_get_remote_address(call);
         NSString* address = nil;
@@ -1327,9 +1341,10 @@ static void audioRouteChangeListenerCallback (
 
 - (void)setupGSMInteraction {
     
-	if (callCenter != nil)
+	if (callCenter != nil) {
+		callCenter.callEventHandler=NULL;
 		[callCenter release];
-	
+	}
     callCenter = [[CTCallCenter alloc] init];
     callCenter.callEventHandler = ^(CTCall* call) {
 		// post on main thread
diff --git a/submodules/linphone b/submodules/linphone
index 353465b28..e829fa6e2 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 353465b2850a7d8fa1be41e4859d22596b653464
+Subproject commit e829fa6e222f37de9c26e4e82f0227078f4b6629