mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 21:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update submodules belle-sip/linphone/bctbx

Browse source
This commit is contained in:
Jehan Monnier 2017-03-28 11:49:22 +02:00
parent d076996925
commit 07c88d455b
5 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/LinphoneManager.m
View file

@ -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];

5
Classes/LinphoneUI/UIAvatarPresence.m
View file

@ -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;

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 91f4645fe26bc4290dd0be23c4a2f9721be1fd9c
Subproject commit 6ba9a56146a876b1eaea20fafcfa5a1d8ff9fbc7

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 5e6dd2ca797d62cf5eaa586cad1b2899c5045e44
Subproject commit 2b67687ea52f0118de469434b448ada57025599b

2
submodules/linphone

@ -1 +1 @@
Subproject commit 3ec8d3669de77117f7ab9b9dbfd42a121bcc2dff
Subproject commit 0f08eba9cd825cd226a2290c7f294afc602fc9a5