mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-02 10:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix macos build issue

Browse source 
remove useless code
This commit is contained in:
Simon Morlat 2013-10-02 14:57:46 +02:00
parent dd83a25bd7
commit a0d580ceb9
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
coreapi/friend.c
View file

@ -108,17 +108,8 @@ LinphoneFriend *linphone_find_friend_by_out_subscribe(MSList *l, SalOp *op){
} }
void __linphone_friend_do_subscribe(LinphoneFriend *fr){ void __linphone_friend_do_subscribe(LinphoneFriend *fr){
char *friend=NULL;
const char *from=NULL;
LinphoneProxyConfig *cfg;
LinphoneCore *lc=fr->lc; LinphoneCore *lc=fr->lc;
friend=linphone_address_as_string(fr->uri);
cfg=linphone_core_lookup_known_proxy(fr->lc,linphone_friend_get_address(fr));
if (cfg!=NULL){
from=linphone_proxy_config_get_identity(cfg);
}else from=linphone_core_get_primary_contact(fr->lc);
if (fr->outsub==NULL){ if (fr->outsub==NULL){
/* people for which we don't have yet an answer should appear as offline */ /* people for which we don't have yet an answer should appear as offline */
fr->presence=NULL; fr->presence=NULL;
@ -132,9 +123,8 @@ void __linphone_friend_do_subscribe(LinphoneFriend *fr){
} }
fr->outsub=sal_op_new(lc->sal); fr->outsub=sal_op_new(lc->sal);
linphone_configure_op(lc,fr->outsub,fr->uri,NULL,TRUE); linphone_configure_op(lc,fr->outsub,fr->uri,NULL,TRUE);
sal_subscribe_presence(fr->outsub,from,friend,lp_config_get_int(lc->config,"sip","subscribe_expires",600)); sal_subscribe_presence(fr->outsub,NULL,NULL,lp_config_get_int(lc->config,"sip","subscribe_expires",600));
fr->subscribe_active=TRUE; fr->subscribe_active=TRUE;
ms_free(friend);
} }
LinphoneFriend * linphone_friend_new(){ LinphoneFriend * linphone_friend_new(){

3
tools/Makefile.am
View file

@ -12,7 +12,8 @@ COMMON_CFLAGS=\
$(STRICT_OPTIONS) \ $(STRICT_OPTIONS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)
AM_CXXFLAGS=$(LIBXML2_CFLAGS) $(STRICT_OPTIONS) #-fpermissive to workaround a g++ bug on macos 32bit SDK.
AM_CXXFLAGS=$(LIBXML2_CFLAGS) $(STRICT_OPTIONS) -fpermissive
EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc