aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/conduit/address-conduit.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4af68a4032..779eaec546 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,9 @@
2001-10-30 JP Rosevear <jpr@ximian.com>
+ * conduit/address-conduit.c (ecard_from_remote_record): make sure
+ to translate the character sets of the names
+
+2001-10-30 JP Rosevear <jpr@ximian.com>
* gui/component/select-names/e-select-names-bonobo.c
(manager_ok_cb): send a null bonobo arg to prevent explosion
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index ffbcaa2343..16a6a14e98 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -856,10 +856,8 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
/* Name */
name = e_card_name_copy (ecard->name);
- if (address.entry[entryFirstname] && *address.entry[entryFirstname])
- name->given = g_strdup (address.entry[entryFirstname]);
- if (address.entry[entryLastname] && *address.entry[entryLastname])
- name->family = g_strdup (address.entry[entryLastname]);
+ name->given = get_entry_text (address, entryFirstname);
+ name->family = get_entry_text (address, entryLastname);
simple = e_card_simple_new (ecard);
txt = e_card_name_to_string (name);