From ebe0d2c60859cd87762c0e45b50300b000e4c715 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 14 Mar 2016 10:03:38 +0100 Subject: [PATCH] xcode: fix compilation --- Classes/LinphoneCoreSettingsStore.m | 1 + Classes/Utils/FastAddressBook.m | 11 +++++------ linphone.xcodeproj/project.pbxproj | 6 ++++-- submodules/linphone | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 3c42d6037..2e66d61df 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -483,6 +483,7 @@ } LinphoneAddress *linphoneAddress = linphone_core_interpret_url(LC, "sip:user@domain.com"); + linphone_address_set_username(linphoneAddress, username.UTF8String); if ([LinphoneManager.instance lpConfigBoolForKey:@"use_phone_number" inSection:@"assistant"]) { char *user = linphone_proxy_config_normalize_phone_number(proxyCfg, username.UTF8String); if (user) { diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index 8d95be363..ac6923118 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -156,16 +156,15 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info ABMultiValueRef lMap = ABRecordCopyValue(lPerson, kABPersonPhoneProperty); if (lMap) { for (int i = 0; i < ABMultiValueGetCount(lMap); i++) { - CFStringRef lValue = ABMultiValueCopyValueAtIndex(lMap, i); + NSString *lValue = (__bridge NSString *)ABMultiValueCopyValueAtIndex(lMap, i); char *normalizedPhone = linphone_proxy_config_normalize_phone_number( - linphone_core_get_default_proxy_config(LC), ((__bridge NSString *)(lValue)).UTF8String); + linphone_core_get_default_proxy_config(LC), lValue.UTF8String); NSString *name = [FastAddressBook - normalizeSipURI:normalizedPhone ? [NSString stringWithUTF8String:normalizedPhone] - : (__bridge NSString *)(lValue)]; - [_addressBookMap setObject:(__bridge id)(lPerson) forKey:name]; + normalizeSipURI:normalizedPhone ? [NSString stringWithUTF8String:normalizedPhone] : lValue]; + [_addressBookMap setObject:(__bridge id)(lPerson) forKey:name ?: lValue]; if (normalizedPhone) ms_free(normalizedPhone); - CFRelease(lValue); + CFRelease((CFStringRef)lValue); } CFRelease(lMap); } diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 0a3914e6d..24c4ff533 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -536,6 +536,7 @@ 635173F91BA082A40095EB0A /* UIChatBubblePhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 635173F81BA082A40095EB0A /* UIChatBubblePhotoCell.m */; }; 6352A5751BE0D4B800594C1C /* CallSideMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6352A5731BE0D4B800594C1C /* CallSideMenuView.m */; }; 6352A5761BE0D4B800594C1C /* CallSideMenuView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6352A5741BE0D4B800594C1C /* CallSideMenuView.xib */; }; + 635598821C96AFFA006ED99A /* vcards in Resources */ = {isa = PBXBuildFile; fileRef = 635598811C96AFFA006ED99A /* vcards */; }; 635775251B6673EC00C8B704 /* HistoryDetailsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 635775241B6673EC00C8B704 /* HistoryDetailsTableView.m */; }; 636316D11A1DEBCB0009B839 /* AboutView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 636316D31A1DEBCB0009B839 /* AboutView.xib */; }; 636316D41A1DEC650009B839 /* SettingsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 636316D61A1DEC650009B839 /* SettingsView.xib */; }; @@ -725,7 +726,6 @@ D3F7998115BD32370018C273 /* TPMultiLayoutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F7998015BD32370018C273 /* TPMultiLayoutViewController.m */; }; D3F83EEC1582021700336684 /* CallView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83EEA1582021700336684 /* CallView.m */; }; D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83F8D15822ABD00336684 /* PhoneMainView.m */; }; - E49CB2641C90524E00FFF73C /* common in Resources */ = {isa = PBXBuildFile; fileRef = E49CB2631C90524E00FFF73C /* common */; }; E49CB2651C90532100FFF73C /* common in Resources */ = {isa = PBXBuildFile; fileRef = E49CB2631C90524E00FFF73C /* common */; }; F03CA84318C72F1A0008889D /* UITextViewNoDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = F03CA84218C72F1A0008889D /* UITextViewNoDefine.m */; }; F05BAA621A5D594E00411815 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F05BAA611A5D594E00411815 /* libz.dylib */; }; @@ -1434,6 +1434,7 @@ 6352A5721BE0D4B800594C1C /* CallSideMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallSideMenuView.h; sourceTree = ""; }; 6352A5731BE0D4B800594C1C /* CallSideMenuView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallSideMenuView.m; sourceTree = ""; }; 6352A5741BE0D4B800594C1C /* CallSideMenuView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CallSideMenuView.xib; sourceTree = ""; }; + 635598811C96AFFA006ED99A /* vcards */ = {isa = PBXFileReference; lastKnownFileType = folder; name = vcards; path = submodules/linphone/tester/vcards; sourceTree = ""; }; 635775231B6673EC00C8B704 /* HistoryDetailsTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryDetailsTableView.h; sourceTree = ""; }; 635775241B6673EC00C8B704 /* HistoryDetailsTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryDetailsTableView.m; sourceTree = ""; }; 636316D21A1DEBCB0009B839 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AboutView.xib; sourceTree = ""; }; @@ -2115,6 +2116,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 635598811C96AFFA006ED99A /* vcards */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97323FDCFA39411CA2CEA /* Frameworks */, F0938158188E629800A55DFA /* iTunesArtwork */, @@ -3677,7 +3679,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E49CB2641C90524E00FFF73C /* common in Resources */, + 635598821C96AFFA006ED99A /* vcards in Resources */, 63058ADA1B4E937300EFAE36 /* certificates in Resources */, 63B21A7D1C623DA80074DFF8 /* test_inprogress.png in Resources */, 63058ADB1B4E937300EFAE36 /* flexisip in Resources */, diff --git a/submodules/linphone b/submodules/linphone index 6f5beda1c..b7020d452 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6f5beda1cc09c839ab5030c2a7795c0461ea27c1 +Subproject commit b7020d452e0cd0a4eb99f6371ccdf7201f3c98e1