diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index ad5b9a4c6..e70b8f92d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -81,7 +81,6 @@ extern void libmsamr_init(MSFactory *factory); extern void libmsx264_init(MSFactory *factory); extern void libmsopenh264_init(MSFactory *factory); extern void libmssilk_init(MSFactory *factory); -extern void libmsbcg729_init(MSFactory *factory); extern void libmswebrtc_init(MSFactory *factory); #define FRONT_CAM_NAME \ @@ -2070,7 +2069,6 @@ void popup_link_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreat libmsamr_init(f); libmsx264_init(f); libmsopenh264_init(f); - libmsbcg729_init(f); libmswebrtc_init(f); linphone_core_reload_ms_plugins(theLinphoneCore, NULL); [self migrationAllPost]; diff --git a/Classes/LinphoneUI/UIAvatarPresence.m b/Classes/LinphoneUI/UIAvatarPresence.m index 0c082002e..2074bbde6 100644 --- a/Classes/LinphoneUI/UIAvatarPresence.m +++ b/Classes/LinphoneUI/UIAvatarPresence.m @@ -57,11 +57,10 @@ INIT_WITH_COMMON_CF { _friend ? linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(_friend)) : LinphonePresenceBasicStatusClosed; const LinphonePresenceModel *model = _friend ? linphone_friend_get_presence_model(_friend) : NULL; - LinphonePresenceActivity *activity = - model ? linphone_presence_model_get_activity(model) ?: LinphonePresenceActivityOffline : NULL; + LinphonePresenceActivity *activity = model ? linphone_presence_model_get_activity(model):NULL; LOGE(@"Friend %s status is now %s/%s since %@", _friend ? linphone_friend_get_name(_friend) : "NULL", - basic == LinphonePresenceBasicStatusOpen ? "open" : "closed", linphone_presence_activity_to_string(activity), + basic == LinphonePresenceBasicStatusOpen ? "open" : "closed", activity? linphone_presence_activity_to_string(activity):"Unknown", [NSDate dateWithTimeIntervalSince1970:linphone_presence_model_get_timestamp(model)]); NSString *imageName; diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 91f4645fe..6ba9a5614 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 91f4645fe26bc4290dd0be23c4a2f9721be1fd9c +Subproject commit 6ba9a56146a876b1eaea20fafcfa5a1d8ff9fbc7 diff --git a/submodules/belle-sip b/submodules/belle-sip index 5e6dd2ca7..2b67687ea 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 5e6dd2ca797d62cf5eaa586cad1b2899c5045e44 +Subproject commit 2b67687ea52f0118de469434b448ada57025599b diff --git a/submodules/linphone b/submodules/linphone index 3ec8d3669..0f08eba9c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3ec8d3669de77117f7ab9b9dbfd42a121bcc2dff +Subproject commit 0f08eba9cd825cd226a2290c7f294afc602fc9a5