mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 3.16.x into master

Browse source
This commit is contained in:
Benjamin Reis 2017-05-10 16:58:52 +02:00
commit 44dfd0fb12
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitmodules vendored
View file

@ -111,4 +111,3 @@
[submodule "submodules/ortp"]
path = submodules/ortp
url = git://git.linphone.org/ortp.git

8
Classes/Contact.m
View file

@ -197,8 +197,8 @@
if (_person) {
normSip = [self setOrCreateSipContactEntry:index withValue:sip];
NSDictionary *lDict = @{
(NSString *)kABPersonInstantMessageUsernameKey : normSip ? normSip : sip,
(NSString *)kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
(NSString *) kABPersonInstantMessageUsernameKey : normSip ? normSip : sip, (NSString *)
kABPersonInstantMessageServiceKey : LinphoneManager.instance.contactSipField
};
ret = [self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index];
@ -358,8 +358,8 @@
CFErrorRef error = NULL;
NSDictionary *lDict = @{
(NSString *)kABPersonInstantMessageUsernameKey : value,
(NSString *)kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
(NSString *) kABPersonInstantMessageUsernameKey : value, (NSString *)
kABPersonInstantMessageServiceKey : [LinphoneManager instance].contactSipField
};
if (![self replaceInProperty:kABPersonInstantMessageProperty value:(__bridge CFTypeRef)(lDict) atIndex:index]) {