From 8b340ced999feeeaeb856ca0a414db7ffc20e645 Mon Sep 17 00:00:00 2001 From: Sushma Rai Date: Wed, 17 Aug 2005 10:29:06 +0000 Subject: 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 --- addressbook/ChangeLog | 8 ++++++++ addressbook/gui/merging/eab-contact-compare.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 793e291d73..c2bed2deac 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2005-08-17 Devashish Sharma + + * 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 * gui/merging/eab-contact-merging.c (response): If the Duplicate diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 4244f3fbff..5cfb8af0e2 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -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)); -- cgit v1.2.3