witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Merge remote-tracking branch 'public/master' into 3.0.x

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-14 14:22:40 +02:00
commit ca4f7356db
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Classes/LinphoneCoreSettingsStore.m
View file

@ -533,8 +533,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
// was a new proxy config, add it
linphone_core_add_proxy_config(lc, proxyCfg);
linphone_core_set_default_proxy_config(lc, proxyCfg);
// reload address book to prepend proxy config domain to contacts' phone number
[[[LinphoneManager instance] fastAddressBook] reload];
}
bad_proxy:
@ -559,6 +557,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
otherButtonTitles:nil] show];
}
}
// reload address book to prepend proxy config domain to contacts' phone number
[[[LinphoneManager instance] fastAddressBook] reload];
}

2
Classes/Utils/FastAddressBook.m
View file

@ -176,8 +176,8 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
}
- (void)loadData {
ABAddressBookRevert(addressBook);
@synchronized(_addressBookMap) {
ABAddressBookRevert(addressBook);
[_addressBookMap removeAllObjects];
CFArrayRef lContacts = ABAddressBookCopyArrayOfAllPeople(addressBook);

2
prepare.py
View file

@ -418,7 +418,7 @@ def main(argv=None):
argparser.add_argument(
'--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
argparser.add_argument(
'-G' '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
'-G', '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
argparser.add_argument(
'-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
argparser.add_argument(