aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-08-17 18:29:06 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-08-17 18:29:06 +0800
commit8b340ced999feeeaeb856ca0a414db7ffc20e645 (patch)
tree3eff481b02ed70c75b9a6cdfdd7b34c7c01136ff
parent4d1961b7f6ca997275bac01ee86b82426b6ca37f (diff)
downloadgsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar.gz
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar.bz2
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar.lz
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar.xz
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.tar.zst
gsoc2013-evolution-8b340ced999feeeaeb856ca0a414db7ffc20e645.zip
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
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/merging/eab-contact-compare.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 793e291d73..c2bed2deac 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
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
Contact Detected Dialog is closed by clicking the cross on the dialog
window the contact-list-editor or contact-editor dialog become unusable
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));