sylpheed-claws bug report
http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/show_bug.cgi?id=1046
sylpheed-claws patch (from bug report)
http://www.colino.net/sylpheed-claws/getpatchset.php3?ver=2.5.6cvs18
my version (for sylpheed_2.3.0~beta4)
<see attached patch>
i didn't like Colin Leroy's patch because it was too large and too
difficult to see the necessary changes (diff doesn't handle simple changes
in indentation well at all), so i produced the attached patch (which stays
as true to sylpheed's original code/logic as possible and therefor quite
small). but i don't want to sound ungrateful as he did all the work.
full disclosure: this patch was created & tested against the 2.3.0~beta4-1
source package from unstable, but was built (with pbuilder) & tested on
testing/"etch".
corey
--
[EMAIL PROTECTED]
diff -urNpd sylpheed-2.3.0beta4.orig/src/jpilot.c
sylpheed-2.3.0beta4/src/jpilot.c
--- sylpheed-2.3.0beta4.orig/src/jpilot.c 2006-08-31 08:21:21.000000000
+0000
+++ sylpheed-2.3.0beta4/src/jpilot.c 2006-11-06 03:55:44.000000000 +0000
@@ -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( JPilotF
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;
