From 96604b4c6362d7ef1c5a74ad5f6a27c7ae5b604e Mon Sep 17 00:00:00 2001 From: Sushma Rai Date: Mon, 22 Aug 2005 05:38:52 +0000 Subject: Fixed the problem of comparison and never returning true, in match_email_hostname(). svn path=/trunk/; revision=30186 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/merging/eab-contact-compare.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'addressbook') 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 + + * 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 * 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 -- cgit v1.2.3