From 597556884c27cc4cf2fe518ea671f3a944a72940 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 14 Dec 2001 04:25:57 +0000 Subject: Make sure to copy the custom fields so they are not overwritten 2001-12-13 JP Rosevear * conduit/address-conduit.c (local_record_from_ecard): Make sure to copy the custom fields so they are not overwritten svn path=/trunk/; revision=15034 --- addressbook/ChangeLog | 5 +++++ addressbook/conduit/address-conduit.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index abfccbe090..3c7d97dbc8 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 JP Rosevear + + * conduit/address-conduit.c (local_record_from_ecard): Make sure + to copy the custom fields so they are not overwritten + 2001-12-13 Jon Trowbridge * backend/ebook/e-book-util.c (simple_query_new): Used diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index d0f07b22dd..0c0645c2e9 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -700,6 +700,11 @@ local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitCont local->addr->phoneLabel[i] = addr.phoneLabel[i]; } local->addr->showPhone = addr.showPhone; + for (i = 0; i < 4; i++) { + if (addr.entry[entryCustom1 + i]) + local->addr->entry[entryCustom1 + i] = + strdup (addr.entry[entryCustom1 + i]); + } free_Address (&addr); } } -- cgit v1.2.3