Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui

This commit is contained in:
Yann Diorcet 2012-11-21 14:06:41 +01:00
commit e622686b14

View file

@ -767,6 +767,10 @@ static LinphoneCoreVTable linphonec_vtable = {
}
- (void)startLibLinphone {
if (theLinphoneCore != nil) {
[LinphoneLogger logc:LinphoneLoggerLog format:"linphonecore is already created"];
return;
}
//get default config from bundle
NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"];