aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2001-12-14 12:25:57 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-12-14 12:25:57 +0800
commit597556884c27cc4cf2fe518ea671f3a944a72940 (patch)
tree4a1a121ad9388cbad5ed2ef84487a19a98363279 /addressbook
parent4d9df464b9c074705e26954106178fe95118ca5f (diff)
downloadgsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar.gz
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar.bz2
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar.lz
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar.xz
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.tar.zst
gsoc2013-evolution-597556884c27cc4cf2fe518ea671f3a944a72940.zip
Make sure to copy the custom fields so they are not overwritten
2001-12-13 JP Rosevear <jpr@ximian.com> * 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
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/conduit/address-conduit.c5
2 files changed, 10 insertions, 0 deletions
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 <jpr@ximian.com>
+
+ * 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 <trow@ximian.com>
* 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);
}
}