diff options
author | Chris Toshok <toshok@ximian.com> | 2002-11-08 10:27:41 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-08 10:27:41 +0800 |
commit | 84463baa0dfa28cfddb7ea6b37126e172e058784 (patch) | |
tree | f8f5db44e58bf474ea22de644aada6a3694f6680 /addressbook/backend/ebook/e-destination.c | |
parent | 3d4f29c7c78f5df88c6f4de8a02c87fb299d4482 (diff) | |
download | gsoc2013-evolution-84463baa0dfa28cfddb7ea6b37126e172e058784.tar.gz gsoc2013-evolution-84463baa0dfa28cfddb7ea6b37126e172e058784.tar.zst gsoc2013-evolution-84463baa0dfa28cfddb7ea6b37126e172e058784.zip |
tests are linking now, and link in libcamel.la.
2002-11-07 Chris Toshok <toshok@ximian.com>
* backend/ebook/Makefile.am: tests are linking now, and link in
libcamel.la.
* backend/ebook/e-destination.c (e_destination_get_name): un-ifdef
since camel is compiling.
(e_destination_get_email): same.
(e_destination_get_address): same.
(e_destination_get_textrep): same.
* backend/ebook/e-card-compare.c (name_fragment_match): use e_utf8_casefold_*.
(name_fragment_match_with_synonyms): same.
(e_card_compare_name_to_string_full): same.
(e_card_compare_name): same.
svn path=/trunk/; revision=18655
Diffstat (limited to 'addressbook/backend/ebook/e-destination.c')
-rw-r--r-- | addressbook/backend/ebook/e-destination.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index 3d5f88acab..6537ea7480 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -372,7 +372,6 @@ e_destination_is_valid (const EDestination *dest) gboolean e_destination_equal (const EDestination *a, const EDestination *b) { -#ifdef PENDING_PORT_WORK const struct _EDestinationPrivate *pa, *pb; const char *na, *nb; @@ -399,13 +398,11 @@ e_destination_equal (const EDestination *a, const EDestination *b) /* Just in case name returns NULL */ na = e_destination_get_name (a); nb = e_destination_get_name (b); - if ((na || nb) && !(na && nb && ! g_utf8_strcasecmp (na, nb))) + if ((na || nb) && !(na && nb && ! e_utf8_casefold_collate (na, nb))) return FALSE; if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b))) return TRUE; -#endif - return FALSE; } void @@ -683,7 +680,6 @@ e_destination_get_email_num (const EDestination *dest) const gchar * e_destination_get_name (const EDestination *dest) { -#ifdef PENDING_PORT_WORK struct _EDestinationPrivate *priv; g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL); @@ -721,15 +717,11 @@ e_destination_get_name (const EDestination *dest) } return priv->name; -#else - return "e_destination_get_name needs port work"; -#endif } const gchar * e_destination_get_email (const EDestination *dest) { -#ifdef PENDING_PORT_WORK struct _EDestinationPrivate *priv; g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL); @@ -774,15 +766,11 @@ e_destination_get_email (const EDestination *dest) } return priv->email; -#else - return "e_destination_get_email needs port work"; -#endif } const gchar * e_destination_get_address (const EDestination *dest) { -#ifdef PENDING_PORT_WORK struct _EDestinationPrivate *priv; g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL); @@ -824,9 +812,6 @@ e_destination_get_address (const EDestination *dest) } return priv->addr; -#else - return "e_destination_get_address needs port work"; -#endif } void @@ -849,7 +834,6 @@ e_destination_set_raw (EDestination *dest, const gchar *raw) const gchar * e_destination_get_textrep (const EDestination *dest) { -#ifdef PENDING_PORT_WORK const char *name, *email; g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL); @@ -880,9 +864,6 @@ e_destination_get_textrep (const EDestination *dest) return email; return ""; -#else - return "e_destination_get_textrep needs port work"; -#endif } gboolean |