diff options
| author | Jon Trowbridge <trow@ximian.com> | 2001-09-20 10:23:41 +0800 |
|---|---|---|
| committer | Jon Trowbridge <trow@src.gnome.org> | 2001-09-20 10:23:41 +0800 |
| commit | 9ae341104ad563c81b2a8d14db9ae3af74a2b803 (patch) | |
| tree | 038aae4dbec8e89d73d7149ed111ff11aaa7df51 /addressbook/backend/ebook/e-card-compare.h | |
| parent | 808bbced26ba3d2960c001725468849bba703f05 (diff) | |
| download | gsoc2013-evolution-9ae341104ad563c81b2a8d14db9ae3af74a2b803.tar.gz gsoc2013-evolution-9ae341104ad563c81b2a8d14db9ae3af74a2b803.tar.zst gsoc2013-evolution-9ae341104ad563c81b2a8d14db9ae3af74a2b803.zip | |
Use the default e-mail address if we have nothing else to go on.
2001-09-19 Jon Trowbridge <trow@ximian.com>
* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
Use the default e-mail address if we have nothing else to go on.
Previously we just failed, which basically meant that name-only
searches would never work properly.
(nickname_simple_query_cb): The logic was a bit tangled here; if
our query status isn't SUCCESS, always give up but don't leak the
destination. And if our nickname query fails and we try the
name-and-email query, use the textrep for a name-only search. The
only reason we are doing a nickname query in the first place is if
we have an obviously invalid e-mail.
(launch_cardify_query): Use e_destination_is_valid to determine
if we should try a nickname query first.
These changes basically fix bug 7728, and generally make the
auto-cardification of addresses a lot more clever and robust.
* backend/ebook/e-book-util.c (name_and_email_cb): Use
e_card_compare_name_to_string instead of e_card_name_match_string.
(e_book_name_and_email_query): The arguments to g_strsplit were
in the wrong order. Doh!
* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
Added. Replaces e_card_name_match_string, and actually works.
* backend/ebook/e-card.c: Removed e_card_name_match_string
function, which didn't work particularly well.
svn path=/trunk/; revision=13003
Diffstat (limited to 'addressbook/backend/ebook/e-card-compare.h')
| -rw-r--r-- | addressbook/backend/ebook/e-card-compare.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h index e5f034600b..56d7b6e1f5 100644 --- a/addressbook/backend/ebook/e-card-compare.h +++ b/addressbook/backend/ebook/e-card-compare.h @@ -41,6 +41,8 @@ typedef enum { typedef void (*ECardMatchQueryCallback) (ECard *card, ECard *match, ECardMatchType type, gpointer closure); +ECardMatchType e_card_compare_name_to_string (ECard *card, const gchar *str); + ECardMatchType e_card_compare_name (ECard *card1, ECard *card2); ECardMatchType e_card_compare_nickname (ECard *card1, ECard *card2); ECardMatchType e_card_compare_email (ECard *card1, ECard *card2); |