aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-08-22 13:38:52 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-08-22 13:38:52 +0800
commit96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e (patch)
tree4a5c3b132a728887adb87812b41a433a2b10a052
parent4883016931244849cc0c725af8532932f47899e3 (diff)
downloadgsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar.gz
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar.bz2
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar.lz
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar.xz
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.tar.zst
gsoc2013-evolution-96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e.zip
Fixed the problem of comparison and never returning true, in
match_email_hostname(). svn path=/trunk/; revision=30186
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/merging/eab-contact-compare.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d1d0297939..9b993f50d8 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-22 Devashish Sharma <sdevashish@novell.com>
+
+ * gui/widgets/eab-contact-compare.c (match_email_hostname): This
+ function was never returning true and the comparison was also not
+ proper. Fixed this.
+
2005-08-17 Devashish Sharma <sdevashish@novell.com>
* gui/merging/eab-contact-compare.c (use_common_book_cb): When
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 7fcaef7ea0..0c28684f23 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -459,9 +459,10 @@ match_email_hostname (const gchar *addr1, const gchar *addr2)
--addr1;
--addr2;
}
-
- /* This will match bob@foo.ximian.com and bob@ximian.com */
- return *addr1 == '.' || *addr2 == '.';
+ if((*addr1 == '@' && *addr2 != '@' ) || (*addr2 == '@' && *addr1 != '@'))
+ return FALSE;
+
+ return TRUE;
}
static EABContactMatchType