From 7329929ebf792c6c340cfbc84bb96a676039e197 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 21 Aug 2012 14:54:10 +0200 Subject: [PATCH] Update mssilk --- Classes/LinphoneAppDelegate.m | 7 ------- Classes/PhoneMainView.m | 6 +----- submodules/mssilk | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 5465b209f..83199faa9 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -30,13 +30,6 @@ #include "LinphoneManager.h" #include "linphonecore.h" -#if __clang__ && __arm__ -extern int __divsi3(int a, int b); -int __aeabi_idiv(int a, int b) { - return __divsi3(a,b); -} -#endif - @implementation UILinphoneWindow @end diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 60514b27a..af4824271 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -326,6 +326,7 @@ static PhoneMainView* phoneMainViewInstance=nil; case LinphoneCallOutgoingInit: case LinphoneCallPausedByRemote: case LinphoneCallConnected: + case LinphoneCallStreamsRunning: case LinphoneCallUpdated: { [self changeCurrentView:[InCallViewController compositeViewDescription]]; @@ -359,11 +360,6 @@ static PhoneMainView* phoneMainViewInstance=nil; [self changeCurrentView:[InCallViewController compositeViewDescription]]; } break; - } - case LinphoneCallStreamsRunning: - { - [self changeCurrentView:[InCallViewController compositeViewDescription]]; - break; } default: break; diff --git a/submodules/mssilk b/submodules/mssilk index 391b6d6b0..d3a6a0a13 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40 +Subproject commit d3a6a0a130730c0eaf9a0b6ed2fc466432852684