From 4891d646da2fc6ffcda8a52c8f0b3c98b903b930 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 26 Sep 2012 13:06:33 +0200
Subject: [PATCH] don't show video acceptance popup when video is disabled
 update linphone submodule

---
 Classes/InCallViewController.m | 11 ++++++-----
 submodules/linphone            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m
index fe947b19e..07b123d72 100644
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@@ -226,6 +226,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark -
 
 - (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state animated:(BOOL)animated {
+	LinphoneCore *lc = [LinphoneManager getLc];
     // Update table
     [callTableView reloadData];  
     
@@ -245,7 +246,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneCallIncomingReceived: 
 		case LinphoneCallOutgoingInit: 
         {
-            if(linphone_core_get_calls_nb([LinphoneManager getLc]) > 1) {
+            if(linphone_core_get_calls_nb(lc) > 1) {
                 [callTableController minimizeAll];
             }
         }
@@ -267,10 +268,10 @@ static UICompositeViewDescription *compositeDescription = nil;
             const LinphoneCallParams* remote = linphone_call_get_remote_params(call);
             
             /* remote wants to add video */
-            if (!linphone_call_params_video_enabled(current) && 
+            if (linphone_core_video_enabled(lc) && !linphone_call_params_video_enabled(current) &&
                 linphone_call_params_video_enabled(remote) && 
-                !linphone_core_get_video_policy([LinphoneManager getLc])->automatically_accept) {
-                linphone_core_defer_call_update([LinphoneManager getLc], call);
+                !linphone_core_get_video_policy(lc)->automatically_accept) {
+                linphone_core_defer_call_update(lc, call);
                 [self displayAskToEnableVideoCall:call];
             } else if (linphone_call_params_video_enabled(current) && !linphone_call_params_video_enabled(remote)) {
                 [self displayTableCall:animated];
@@ -287,7 +288,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         case LinphoneCallEnd:
         case LinphoneCallError:
         {
-            if(linphone_core_get_calls_nb([LinphoneManager getLc]) <= 2) {
+            if(linphone_core_get_calls_nb(lc) <= 2) {
                 [callTableController maximizeAll];
             }
             break;
diff --git a/submodules/linphone b/submodules/linphone
index d2bf8846e..e6d835fa7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit d2bf8846e3c40ce5b4dec886f2d0fc6d9698fc87
+Subproject commit e6d835fa745550a043e18a3b850d0cb353ef9ae8