diff options
| author | JP Rosevear <jpr@ximian.com> | 2001-09-29 05:17:30 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-09-29 05:17:30 +0800 |
| commit | 50f54e757ca63df54eba9ca7125d1f4244239f2c (patch) | |
| tree | 5278a9fbc8cc75efeabdd59077ae688854adda4b /addressbook/conduit | |
| parent | f26378de36f4702f0e1d83b50b2046ad053798a2 (diff) | |
| download | gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar.gz gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar.bz2 gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar.lz gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar.xz gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.tar.zst gsoc2013-evolution-50f54e757ca63df54eba9ca7125d1f4244239f2c.zip | |
g_strdup (pas_backend_file_changes): ditto, make sure to free all data and
2001-09-28 JP Rosevear <jpr@ximian.com>
* backend/pas/pas-backend-file.c
(pas_backend_file_changes_foreach_key): g_strdup
(pas_backend_file_changes): ditto, make sure to free all data and
do a hash write after each add/remove
* conduit/address-conduit.c (local_record_to_pilot_record): use
the local record category
(local_record_from_ecard): ndle the fields and category we don't
sync by making sure we don't overwrite them
svn path=/trunk/; revision=13232
Diffstat (limited to 'addressbook/conduit')
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index ef78fc88d0..42c56cd707 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -322,7 +322,7 @@ local_record_to_pilot_record (EAddrLocalRecord *local, LOG ("local_record_to_pilot_record\n"); p.ID = local->local.ID; - p.category = 0; + p.category = local->local.category; p.attr = local->local.attr; p.archived = local->local.archived; p.secret = local->local.secret; @@ -355,15 +355,20 @@ local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitCont local->addr = g_new0 (struct Address, 1); - /* Handle the fields we don't sync by making sure we don't overwrite them */ + /* Handle the fields and category we don't sync by making sure + * we don't overwrite them + */ if (local->local.ID != 0) { char record[0xffff]; - + int cat = 0; + if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, local->local.ID, &record, - NULL, NULL, NULL, NULL) > 0) + NULL, NULL, NULL, &cat) > 0) { + local->local.category = cat; unpack_Address (local->addr, record, 0xffff); + } } if (ecard->name) { |