While adding new contact, during the duplicate contact check, not comparing

the email id of new contact with the email ids of contact lists.

svn path=/trunk/; revision=30145
This commit is contained in:
Sushma Rai
2005-08-17 10:29:06 +00:00
parent 4d1961b7f6
commit 8b340ced99
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2005-08-17 Devashish Sharma <sdevashish@novell.com>
* gui/merging/eab-contact-compare.c (eab_contact_compare): Add an email
which is not there in any contact to a contact list, now if you want
to add a contact with that email id it gives you duplicate detected. So
while checking for duplicates when adding a new contact emails should
not be compared with existing contact lists email.
2005-08-17 Devashish Sharma <sdevashish@novell.com>
* gui/merging/eab-contact-merging.c (response): If the Duplicate

View File

@ -561,7 +561,8 @@ eab_contact_compare (EContact *contact1, EContact *contact2)
result = EAB_CONTACT_MATCH_NONE;
result = combine_comparisons (result, eab_contact_compare_name (contact1, contact2));
result = combine_comparisons (result, eab_contact_compare_nickname (contact1, contact2));
result = combine_comparisons (result, eab_contact_compare_email (contact1, contact2));
if(!e_contact_get (contact2, E_CONTACT_IS_LIST))
result = combine_comparisons (result, eab_contact_compare_email (contact1, contact2));
result = combine_comparisons (result, eab_contact_compare_address (contact1, contact2));
result = combine_comparisons (result, eab_contact_compare_telephone (contact1, contact2));
result = combine_comparisons (result, eab_contact_compare_file_as (contact1, contact2));