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

This commit is contained in:
Yann Diorcet 2012-07-27 15:59:58 +02:00
commit 02eab45559
2 changed files with 5 additions and 2 deletions

View file

@ -179,7 +179,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
id data = [avatarMap objectForKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
if(data == nil) {
image = [FastAddressBook getContactImage:contact thumbnail:true];
[avatarMap setObject:image forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
if(image != nil) {
[avatarMap setObject:image forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
} else {
[avatarMap setObject:[NSNull null] forKey:[NSNumber numberWithInt: ABRecordGetRecordID(contact)]];
}
} else if(data != [NSNull null]) {
image = data;
}

View file

@ -48,7 +48,6 @@ typedef enum _HistoryView {
[allButton release];
[missedButton release];
[editButton release];
[super dealloc];
}