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

Merge branch 'master' into dev_loc

Browse source
This commit is contained in:
Sandrine Avakian 2017-03-20 14:55:03 +01:00
commit 49f9b9ea25
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
coreapi/friend.c
View file

@ -659,23 +659,23 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
const LinphonePresenceModel * linphone_friend_get_presence_model(const LinphoneFriend *lf) {
const LinphonePresenceModel *presence = NULL;
LinphoneFriend* fuckconst = (LinphoneFriend*)lf;
const bctbx_list_t* addrs = linphone_friend_get_addresses(fuckconst);
LinphoneFriend* const_lf = (LinphoneFriend*)lf;
const bctbx_list_t* addrs = linphone_friend_get_addresses(const_lf);
bctbx_list_t* phones = NULL;
bctbx_list_t *it;
for (it = (bctbx_list_t *)addrs; it!= NULL; it = it->next) {
LinphoneAddress *addr = (LinphoneAddress*)it->data;
char *uri = linphone_address_as_string_uri_only(addr);
presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, uri);
presence = linphone_friend_get_presence_model_for_uri_or_tel(const_lf, uri);
ms_free(uri);
if (presence) break;
}
if (presence) return presence;
phones = linphone_friend_get_phone_numbers(fuckconst);
phones = linphone_friend_get_phone_numbers(const_lf);
for (it = phones; it!= NULL; it = it->next) {
presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, it->data);
presence = linphone_friend_get_presence_model_for_uri_or_tel(const_lf, it->data);
if (presence) break;
}
bctbx_list_free(phones);

2
coreapi/linphonecore.c
View file

@ -5481,7 +5481,7 @@ void sip_config_uninit(LinphoneCore *lc)
/*now that we are unregisted, there is no more channel using tunnel socket we no longer need the tunnel.*/
#ifdef TUNNEL_ENABLED
if (lc->tunnel) {
linphone_tunnel_destroy(lc->tunnel);
linphone_tunnel_ref(lc->tunnel);
lc->tunnel=NULL;
ms_message("Tunnel destroyed.");
}