From 7aab773e3f72e10e4d79f8163904587b8569e614 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Oct 2015 12:01:31 +0200 Subject: [PATCH 1/2] Add missing comma. --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 9ca12476a..aca19f628 100755 --- a/prepare.py +++ b/prepare.py @@ -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( From 5695787f89e27ff9674c2294d26d433c9a6bd419 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 14 Oct 2015 14:21:43 +0200 Subject: [PATCH 2/2] Settings: fix crash when adding an account without assistant --- Classes/LinphoneCoreSettingsStore.m | 3 +-- Classes/Utils/FastAddressBook.m | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 451dbefb4..0aae9d65b 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -519,8 +519,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: @@ -545,6 +543,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]; } diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index fc4694d45..f9b88bd8b 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -183,8 +183,8 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info } - (void)loadData { - ABAddressBookRevert(addressBook); @synchronized(addressBookMap) { + ABAddressBookRevert(addressBook); [addressBookMap removeAllObjects]; CFArrayRef lContacts = ABAddressBookCopyArrayOfAllPeople(addressBook);