diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-11-15 01:39:45 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-11-15 01:39:45 +0000 |
| commit | 5172cd5e5da898528072393c07aed1375192c2d4 (patch) | |
| tree | c78584b751705129aaefc83cab9a1aae952b69ea /src/jpilot.c | |
| parent | f6f2d72eb62b4bf5b79dc19ccdcbf532d8cab784 (diff) | |
applied the patch for libpisock12 support.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1302 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/jpilot.c')
| -rw-r--r-- | src/jpilot.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/jpilot.c b/src/jpilot.c index 4624e141..d456201b 100644 --- a/src/jpilot.c +++ b/src/jpilot.c @@ -42,10 +42,12 @@ # include <libpisock/pi-args.h> # include <libpisock/pi-appinfo.h> # include <libpisock/pi-address.h> +# include <libpisock/pi-version.h> #else # include <pi-args.h> # include <pi-appinfo.h> # include <pi-address.h> +# include <pi-version.h> #endif #include "mgutils.h" @@ -1009,10 +1011,22 @@ static void jpilot_load_address( JPilotFile *pilotFile, buf_rec *buf, ItemFolder struct AddressAppInfo *ai; gchar **firstName = NULL; gchar **lastName = NULL; +#if (PILOT_LINK_MAJOR > 11) + pi_buffer_t *RecordBuffer; +#endif /* PILOT_LINK_0_12 */ /* Retrieve address */ +#if (PILOT_LINK_MAJOR < 12) num = unpack_Address( & addr, buf->buf, buf->size ); if( num > 0 ) { +#else /* PILOT_LINK_0_12 */ + RecordBuffer = pi_buffer_new(buf->size); + memcpy(RecordBuffer->data, buf->buf, buf->size); + RecordBuffer->used = buf->size; + num = unpack_Address( & addr, RecordBuffer, address_v1 ); + pi_buffer_free(RecordBuffer); + if (num != -1) { +#endif addrEnt = addr.entry; attrib = buf->attrib; unique_id = buf->unique_id; |