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

This commit is contained in:
Guillaume BIENKOWSKI 2013-09-30 17:35:24 +02:00
commit 6c60ddbebc
3 changed files with 3 additions and 3 deletions

View file

@ -82,7 +82,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
if (addr){
const char *proxy=linphone_proxy_config_get_addr(cfg);
LinphoneAddress *proxy_addr=linphone_address_new(proxy);
int port=linphone_address_get_port_int(proxy_addr);
int port=linphone_address_get_port(proxy_addr);
[self setString: linphone_address_get_username(addr) forKey:@"username_preference"];
[self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"];

@ -1 +1 @@
Subproject commit 326aa5d540cfeeecdae56ef1bf8fe7dc7823d146
Subproject commit f3f343c3ac5307a8f14effe253f8eaf3e85c4cd0

@ -1 +1 @@
Subproject commit fed415507fddb794d2110c3a4e022c12018229e5
Subproject commit 643dc7f9f6c6b7d542a6e1724f943f97e0c0a9ca