Merge branch 'master' of git.linphone.org:linphone

This commit is contained in:
Simon Morlat 2011-10-25 12:48:51 +02:00
commit badf9bf7d6
2 changed files with 5 additions and 1 deletions

View file

@ -444,6 +444,10 @@ LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, cons
}
username=linphone_address_get_username(puri);
domain=linphone_address_get_domain(puri);
if (domain==NULL) {
linphone_address_destroy(puri);
return NULL;
}
for(elem=lc->friends;elem!=NULL;elem=ms_list_next(elem)){
lf=(LinphoneFriend*)elem->data;
const char *it_username=linphone_address_get_username(lf->uri);

@ -1 +1 @@
Subproject commit 2befd4c69cda862f32b1b7ee42db2a8606bae3b7
Subproject commit 55a95502de5580ffe65225e0d96adeb218a58b7e