Home | History | Annotate | Download | only in patches
      1  10164  jyu_mit --- acinclude.m4-orig	2006-11-17 15:22:46.943233000 +0800
      2  10164  jyu_mit +++ acinclude.m4	2006-11-17 14:08:23.872472000 +0800
      3  10164  jyu_mit @@ -268,3 +268,119 @@
      4  10164  jyu_mit    AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
      5  10164  jyu_mit    AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
      6  10164  jyu_mit  ])
      7  10164  jyu_mit +
      8  10164  jyu_mit +# PILOT_LINK_CHECK
      9  10164  jyu_mit +# Adds --with-pisock and determines the verion of the pisock
     10  10164  jyu_mit +#
     11  10164  jyu_mit +
     12  10164  jyu_mit +AC_SUBST(PISOCK_CFLAGS)
     13  10164  jyu_mit +AC_SUBST(PISOCK_LIBS)
     14  10164  jyu_mit +
     15  10164  jyu_mit +AC_DEFUN([PILOT_LINK_HOOK],[
     16  10164  jyu_mit +	AC_ARG_WITH(pisock,
     17  10164  jyu_mit +	[  --with-pisock            Specify prefix for pisock files],[
     18  10164  jyu_mit +	if test x$withval = xyes; then
     19  10164  jyu_mit +	    dnl Note that an empty true branch is not valid sh syntax.
     20  10164  jyu_mit +	    ifelse([$1], [], :, [$1])
     21  10164  jyu_mit +	else
     22  10164  jyu_mit +	    PISOCK_CFLAGS="-I$withval/include"
     23  10164  jyu_mit +	    incdir="$withval/include"
     24  10164  jyu_mit +	    PISOCK_LIBS="-L$withval/lib -lpisock -lpisync"
     25  10164  jyu_mit +	    AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
     26  10164  jyu_mit +	    if test -r $withval/lib/libpisock.so; then
     27  10164  jyu_mit +		AC_MSG_RESULT(yes)
     28  10164  jyu_mit +	    else
     29  10164  jyu_mit +		AC_MSG_ERROR([Unable to find libpisock. Try  http://www.pilot-link.org.])
     30  10164  jyu_mit +	    fi
     31  10164  jyu_mit +	fi
     32  10164  jyu_mit +	])
     33  10164  jyu_mit +
     34  10164  jyu_mit +	if test x$PISOCK_CFLAGS = x; then
     35  10164  jyu_mit +	    AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [
     36  10164  jyu_mit +	    AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock"
     37  10164  jyu_mit +	                                             piversion_include="libpisock/pi-version.h"
     38  10164  jyu_mit +						     incdir="/usr/include/libpisock"
     39  10164  jyu_mit +                                                    ], [
     40  10164  jyu_mit +	    AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock"
     41  10164  jyu_mit +	                                                   piversion_include="$prefix/include/pi-version.h"
     42  10164  jyu_mit +						           if test x$PISOCK_LIBDIR = x; then
     43  10164  jyu_mit +							      incdir="$prefix/include"
     44  10164  jyu_mit +							      PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync"
     45  10164  jyu_mit +                                                           fi							  ],
     46  10164  jyu_mit +	    AC_MSG_ERROR([Unable to find pi-version.h])) 
     47  10164  jyu_mit +	    ])
     48  10164  jyu_mit +	    ])
     49  10164  jyu_mit +	fi
     50  10164  jyu_mit +		
     51  10164  jyu_mit +	if test "x$PISOCK_LIBS" = "x"; then
     52  10164  jyu_mit +		AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock -lpisync"], 
     53  10164  jyu_mit +			[ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ])
     54  10164  jyu_mit +	fi
     55  10164  jyu_mit +	
     56  10164  jyu_mit +	AC_ARG_ENABLE(pilotlinktest,
     57  10164  jyu_mit +		[  --enable-pilotlinktest   Test for correct version of pilot-link],
     58  10164  jyu_mit +		[testplversion=$enableval],
     59  10164  jyu_mit +		[ testplversion=yes ]
     60  10164  jyu_mit +	)
     61  10164  jyu_mit +
     62  10164  jyu_mit +	if test x$piversion_include = x; then
     63  10164  jyu_mit +		piversion_include="pi-version.h"
     64  10164  jyu_mit +	fi
     65  10164  jyu_mit +
     66  10164  jyu_mit +	pi_major=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_VERSION'|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'`
     67  10164  jyu_mit +	pi_minor=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MAJOR'|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'`
     68  10164  jyu_mit +	pi_micro=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MINOR'|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'`
     69  10164  jyu_mit +	pi_patch=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_PATCH'|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'`
     70  10164  jyu_mit +
     71  10164  jyu_mit +	PILOT_LINK_MAJOR="$pi_major"
     72  10164  jyu_mit +	PILOT_LINK_MINOR="$pi_minor"
     73  10164  jyu_mit +	PILOT_LINK_MICRO="$pi_micro"
     74  10164  jyu_mit +	PILOT_LINK_PATCH="$pi_patch"
     75  10164  jyu_mit +	PILOT_LINK_VERSION="$pi_major.$pi_minor.$pi_micro$pi_patch"
     76  10164  jyu_mit +
     77  10164  jyu_mit +	if test x$testplversion = xyes; then
     78  10164  jyu_mit +		AC_MSG_CHECKING([for pilot-link version >= $1])
     79  10164  jyu_mit +		pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     80  10164  jyu_mit +		pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     81  10164  jyu_mit +		pl_mc=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     82  10164  jyu_mit +		CFLAGS_save="$CFLAGS"
     83  10164  jyu_mit +		CFLAGS="$CFLAGS $PISOCK_CFLAGS"
     84  10164  jyu_mit +		AC_TRY_RUN(
     85  10164  jyu_mit +			[
     86  10164  jyu_mit +			#include <$piversion_include>
     87  10164  jyu_mit +			int main(int argc,char *argv[]) {
     88  10164  jyu_mit +				if (PILOT_LINK_VERSION == $pl_ma) {
     89  10164  jyu_mit +					if (PILOT_LINK_MAJOR == $pl_mi) {
     90  10164  jyu_mit +						if (PILOT_LINK_MINOR >= $pl_mc) {
     91  10164  jyu_mit +							return 0;
     92  10164  jyu_mit +				       	  	}
     93  10164  jyu_mit +					} else if (PILOT_LINK_MAJOR > $pl_mi) {
     94  10164  jyu_mit +						return 0;
     95  10164  jyu_mit +					}
     96  10164  jyu_mit +				} else if (PILOT_LINK_VERSION > $pl_ma) {
     97  10164  jyu_mit +					return 0;
     98  10164  jyu_mit +				}
     99  10164  jyu_mit +				return 1;
    100  10164  jyu_mit +			}
    101  10164  jyu_mit +			],
    102  10164  jyu_mit +			[AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])],
    103  10164  jyu_mit +			[AC_MSG_ERROR([pilot-link >= $1 required])],
    104  10164  jyu_mit +			[AC_MSG_WARN([No action taken for crosscompile])]
    105  10164  jyu_mit +		)
    106  10164  jyu_mit +		CFLAGS="$CFLAGS_save"
    107  10164  jyu_mit +	fi
    108  10164  jyu_mit +
    109  10164  jyu_mit +	unset piversion_include
    110  10164  jyu_mit +	unset pi_verion
    111  10164  jyu_mit +	unset pi_major
    112  10164  jyu_mit +	unset pi_minor
    113  10164  jyu_mit +	unset pi_patch
    114  10164  jyu_mit +	unset incdir
    115  10164  jyu_mit +	unset pl_mi
    116  10164  jyu_mit +	unset pl_ma
    117  10164  jyu_mit +	unset pl_ve
    118  10164  jyu_mit +])
    119  10164  jyu_mit +
    120  10164  jyu_mit +AC_DEFUN([PILOT_LINK_CHECK],[
    121  10164  jyu_mit +	PILOT_LINK_HOOK($1,[],nofailure)
    122  10164  jyu_mit +])
    123  10164  jyu_mit --- configure.in-orig	2006-11-17 15:23:02.816596000 +0800
    124  10164  jyu_mit +++ configure.in	2006-11-17 14:09:59.220305000 +0800
    125  10164  jyu_mit @@ -606,8 +606,24 @@
    126  10164  jyu_mit  	fi
    127  10164  jyu_mit  fi
    128  10164  jyu_mit  AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")
    129  10164  jyu_mit +
    130  10164  jyu_mit ++dnl ******************************
    131  10164  jyu_mit ++dnl If pilot conduits are enabled, check version of pilot-link
    132  10164  jyu_mit ++dnl ******************************
    133  10164  jyu_mit +
    134  10164  jyu_mit  if test x$enable_pilot_conduits = xyes; then
    135  10164  jyu_mit     msg_pilot=yes
    136  10164  jyu_mit +
    137  10164  jyu_mit +   PILOT_LINK_CHECK(0.11.4)
    138  10164  jyu_mit +   AC_SUBST(PILOT_LINK_MAJOR)
    139  10164  jyu_mit +   AC_SUBST(PILOT_LINK_MINOR)
    140  10164  jyu_mit +   AC_SUBST(PILOT_LINK_MICRO)
    141  10164  jyu_mit +   AC_SUBST(PILOT_LINK_PATCH)
    142  10164  jyu_mit +   AC_SUBST(PILOT_LINK_VERSION)
    143  10164  jyu_mit +
    144  10164  jyu_mit +   if test $PILOT_LINK_MINOR -ge 12; then
    145  10164  jyu_mit +      AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater])
    146  10164  jyu_mit +   fi
    147  10164  jyu_mit  else
    148  10164  jyu_mit     msg_pilot=no
    149  10164  jyu_mit  fi
    150  10164  jyu_mit --- addressbook/conduit/address-conduit.c-orig	2006-11-17 15:23:24.637554000 +0800
    151  10164  jyu_mit +++ addressbook/conduit/address-conduit.c	2006-11-17 15:19:48.662053000 +0800
    152  10164  jyu_mit @@ -462,6 +462,9 @@
    153  10164  jyu_mit  {
    154  10164  jyu_mit  	static char buff[ 4096 ];
    155  10164  jyu_mit  	struct Address addr;
    156  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    157  10164  jyu_mit +	pi_buffer_t * buffer;
    158  10164  jyu_mit +#endif
    159  10164  jyu_mit  
    160  10164  jyu_mit  	if (remote == NULL) {
    161  10164  jyu_mit  		sprintf (buff, "[NULL]");
    162  10164  jyu_mit @@ -469,7 +472,21 @@
    163  10164  jyu_mit  	}
    164  10164  jyu_mit  
    165  10164  jyu_mit  	memset (&addr, 0, sizeof (struct Address));
    166  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    167  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    168  10164  jyu_mit +	if(buffer == NULL){
    169  10164  jyu_mit +		sprintf (buff, "[NULL]");
    170  10164  jyu_mit +		return buff;
    171  10164  jyu_mit +	}
    172  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    173  10164  jyu_mit +		sprintf (buff, "[NULL]");
    174  10164  jyu_mit +		return buff;
    175  10164  jyu_mit +	}
    176  10164  jyu_mit +	unpack_Address (&addr, buffer, address_v1);
    177  10164  jyu_mit +	pi_buffer_free(buffer);
    178  10164  jyu_mit +#else
    179  10164  jyu_mit  	unpack_Address (&addr, remote->record, remote->length);
    180  10164  jyu_mit +#endif
    181  10164  jyu_mit  
    182  10164  jyu_mit  	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
    183  10164  jyu_mit  		    addr.entry[entryLastname] ?
    184  10164  jyu_mit @@ -792,6 +809,9 @@
    185  10164  jyu_mit  {
    186  10164  jyu_mit  	GnomePilotRecord p;
    187  10164  jyu_mit  	static char record[0xffff];
    188  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    189  10164  jyu_mit +	pi_buffer_t * buffer;
    190  10164  jyu_mit +#endif
    191  10164  jyu_mit  	
    192  10164  jyu_mit  	g_assert (local->addr != NULL );
    193  10164  jyu_mit  	
    194  10164  jyu_mit @@ -804,9 +824,25 @@
    195  10164  jyu_mit  	p.secret = local->local.secret;
    196  10164  jyu_mit  
    197  10164  jyu_mit  	/* Generate pilot record structure */
    198  10164  jyu_mit +
    199  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    200  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    201  10164  jyu_mit +	if(buffer == NULL){
    202  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    203  10164  jyu_mit +		return p;
    204  10164  jyu_mit +	}
    205  10164  jyu_mit +
    206  10164  jyu_mit +	pack_Address (local->addr, buffer, address_v1);
    207  10164  jyu_mit +
    208  10164  jyu_mit +	p.record = g_new0(unsigned char, buffer->used);
    209  10164  jyu_mit +	p.length = buffer->used;
    210  10164  jyu_mit +	memcpy(p.record, buffer->data, buffer->used);
    211  10164  jyu_mit +
    212  10164  jyu_mit +	pi_buffer_free(buffer);
    213  10164  jyu_mit +#else
    214  10164  jyu_mit  	p.record = record;
    215  10164  jyu_mit  	p.length = pack_Address (local->addr, p.record, 0xffff);
    216  10164  jyu_mit -
    217  10164  jyu_mit +#endif
    218  10164  jyu_mit  	return p;	
    219  10164  jyu_mit  }
    220  10164  jyu_mit  
    221  10164  jyu_mit @@ -834,16 +870,34 @@
    222  10164  jyu_mit  	 */
    223  10164  jyu_mit  	if (local->local.ID != 0) {
    224  10164  jyu_mit  		struct Address addr;
    225  10164  jyu_mit -		char record[0xffff];
    226  10164  jyu_mit  		int cat = 0;
    227  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    228  10164  jyu_mit +		pi_buffer_t * record;
    229  10164  jyu_mit +		record = pi_buffer_new(DLP_BUF_SIZE);
    230  10164  jyu_mit +		if(record == NULL){
    231  10164  jyu_mit +			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    232  10164  jyu_mit +			return;
    233  10164  jyu_mit +		}
    234  10164  jyu_mit +#else
    235  10164  jyu_mit +		char record[0xffff];
    236  10164  jyu_mit +#endif
    237  10164  jyu_mit  		
    238  10164  jyu_mit  		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
    239  10164  jyu_mit  					ctxt->dbi->db_handle,
    240  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    241  10164  jyu_mit +					local->local.ID, record, 
    242  10164  jyu_mit +					NULL, NULL, &cat) > 0) {
    243  10164  jyu_mit +#else
    244  10164  jyu_mit  					local->local.ID, &record, 
    245  10164  jyu_mit  					NULL, NULL, NULL, &cat) > 0) {
    246  10164  jyu_mit +#endif
    247  10164  jyu_mit  			local->local.category = cat;
    248  10164  jyu_mit  			memset (&addr, 0, sizeof (struct Address));
    249  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    250  10164  jyu_mit +			unpack_Address (&addr, record, address_v1);
    251  10164  jyu_mit +#else
    252  10164  jyu_mit  			unpack_Address (&addr, record, 0xffff);
    253  10164  jyu_mit +#endif
    254  10164  jyu_mit  			for (i = 0; i < 5; i++) {
    255  10164  jyu_mit  				if (addr.entry[entryPhone1 + i])
    256  10164  jyu_mit  					local->addr->entry[entryPhone1 + i] = 
    257  10164  jyu_mit @@ -858,6 +912,9 @@
    258  10164  jyu_mit  			}
    259  10164  jyu_mit  			free_Address (&addr);
    260  10164  jyu_mit  		}
    261  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    262  10164  jyu_mit +		pi_buffer_free (record);
    263  10164  jyu_mit +#endif
    264  10164  jyu_mit  	}
    265  10164  jyu_mit  
    266  10164  jyu_mit  	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
    267  10164  jyu_mit @@ -1019,11 +1076,27 @@
    268  10164  jyu_mit  	EContactField next_mail, next_home, next_work, next_fax;
    269  10164  jyu_mit  	EContactField next_other, next_main, next_pager, next_mobile;
    270  10164  jyu_mit  	int i;
    271  10164  jyu_mit -
    272  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    273  10164  jyu_mit +	pi_buffer_t * buffer;
    274  10164  jyu_mit +#endif
    275  10164  jyu_mit  	g_return_val_if_fail(remote!=NULL,NULL);
    276  10164  jyu_mit  	memset (&address, 0, sizeof (struct Address));
    277  10164  jyu_mit -	unpack_Address (&address, remote->record, remote->length);
    278  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    279  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    280  10164  jyu_mit +	if(buffer == NULL){
    281  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    282  10164  jyu_mit +		return NULL;
    283  10164  jyu_mit +	}
    284  10164  jyu_mit  
    285  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    286  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    287  10164  jyu_mit +		return NULL;
    288  10164  jyu_mit +	}
    289  10164  jyu_mit +	unpack_Address (&address, buffer, address_v1);
    290  10164  jyu_mit +	pi_buffer_free(buffer);
    291  10164  jyu_mit +#else
    292  10164  jyu_mit +	unpack_Address (&address, remote->record, remote->length);
    293  10164  jyu_mit +#endif
    294  10164  jyu_mit  	if (in_contact == NULL)
    295  10164  jyu_mit  		contact = e_contact_new ();
    296  10164  jyu_mit  	else
    297  10164  jyu_mit @@ -1217,6 +1290,9 @@
    298  10164  jyu_mit  	char *change_id;
    299  10164  jyu_mit  	char *auth;
    300  10164  jyu_mit  	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
    301  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    302  10164  jyu_mit +	pi_buffer_t *buffer;
    303  10164  jyu_mit +#endif
    304  10164  jyu_mit  
    305  10164  jyu_mit  	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
    306  10164  jyu_mit  
    307  10164  jyu_mit @@ -1302,10 +1378,19 @@
    308  10164  jyu_mit    	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
    309  10164  jyu_mit    	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
    310  10164  jyu_mit  
    311  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    312  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    313  10164  jyu_mit +	if(buffer == NULL){
    314  10164  jyu_mit +		return pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    315  10164  jyu_mit +	}
    316  10164  jyu_mit +	
    317  10164  jyu_mit +	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    318  10164  jyu_mit +			      DLP_BUF_SIZE, buffer);
    319  10164  jyu_mit +#else
    320  10164  jyu_mit  	buf = (unsigned char*)g_malloc (0xffff);
    321  10164  jyu_mit  	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    322  10164  jyu_mit  			      (unsigned char *)buf, 0xffff);
    323  10164  jyu_mit -	
    324  10164  jyu_mit +#endif	
    325  10164  jyu_mit  	if (len < 0) {
    326  10164  jyu_mit  		WARN (_("Could not read pilot's Address application block"));
    327  10164  jyu_mit  		WARN ("dlp_ReadAppBlock(...) = %d", len);
    328  10164  jyu_mit @@ -1313,9 +1398,13 @@
    329  10164  jyu_mit  					   _("Could not read pilot's Address application block"));
    330  10164  jyu_mit  		return -1;
    331  10164  jyu_mit  	}
    332  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    333  10164  jyu_mit +	unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
    334  10164  jyu_mit +	pi_buffer_free (buffer);
    335  10164  jyu_mit +#else
    336  10164  jyu_mit  	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
    337  10164  jyu_mit  	g_free (buf);
    338  10164  jyu_mit -
    339  10164  jyu_mit +#endif
    340  10164  jyu_mit    	check_for_slow_setting (conduit, ctxt);
    341  10164  jyu_mit  	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
    342  10164  jyu_mit  	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
    343  10164  jyu_mit --- calendar/conduits/calendar/calendar-conduit.c-orig	2006-11-17 15:23:59.887142000 +0800
    344  10164  jyu_mit +++ calendar/conduits/calendar/calendar-conduit.c	2006-11-17 15:19:16.026169000 +0800
    345  10164  jyu_mit @@ -413,6 +413,9 @@
    346  10164  jyu_mit  {
    347  10164  jyu_mit  	static char buff[ 4096 ];
    348  10164  jyu_mit  	struct Appointment appt;
    349  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    350  10164  jyu_mit +	pi_buffer_t * buffer;
    351  10164  jyu_mit +#endif
    352  10164  jyu_mit  
    353  10164  jyu_mit  	if (remote == NULL) {
    354  10164  jyu_mit  		sprintf (buff, "[NULL]");
    355  10164  jyu_mit @@ -420,8 +423,22 @@
    356  10164  jyu_mit  	}
    357  10164  jyu_mit  
    358  10164  jyu_mit  	memset (&appt, 0, sizeof (struct Appointment));
    359  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    360  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    361  10164  jyu_mit +	if(buffer == NULL){
    362  10164  jyu_mit +		sprintf (buff, "[NULL]");
    363  10164  jyu_mit +		return buff;
    364  10164  jyu_mit +	}
    365  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    366  10164  jyu_mit +		sprintf (buff, "[NULL]");
    367  10164  jyu_mit +		return buff;
    368  10164  jyu_mit +	}
    369  10164  jyu_mit +	
    370  10164  jyu_mit +	unpack_Appointment (&appt, buffer, datebook_v1);
    371  10164  jyu_mit +	pi_buffer_free(buffer);
    372  10164  jyu_mit +#else
    373  10164  jyu_mit  	unpack_Appointment (&appt, remote->record, remote->length);
    374  10164  jyu_mit -
    375  10164  jyu_mit +#endif
    376  10164  jyu_mit  	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
    377  10164  jyu_mit  		    mktime (&appt.begin),
    378  10164  jyu_mit  		    mktime (&appt.end),
    379  10164  jyu_mit @@ -819,6 +836,9 @@
    380  10164  jyu_mit  {
    381  10164  jyu_mit  	GnomePilotRecord p;
    382  10164  jyu_mit  	static char record[0xffff];
    383  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    384  10164  jyu_mit +	pi_buffer_t * buffer;
    385  10164  jyu_mit +#endif
    386  10164  jyu_mit  
    387  10164  jyu_mit  	g_assert (local->comp != NULL);
    388  10164  jyu_mit  	g_assert (local->appt != NULL );
    389  10164  jyu_mit @@ -830,9 +850,23 @@
    390  10164  jyu_mit  	p.secret = local->local.secret;
    391  10164  jyu_mit  
    392  10164  jyu_mit  	/* Generate pilot record structure */
    393  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    394  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    395  10164  jyu_mit +	if(buffer == NULL){
    396  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    397  10164  jyu_mit +		return p;
    398  10164  jyu_mit +	}
    399  10164  jyu_mit +	
    400  10164  jyu_mit +	pack_Appointment (local->appt, buffer, datebook_v1);
    401  10164  jyu_mit +	p.record = g_new0(unsigned char, buffer->used);
    402  10164  jyu_mit +	p.length = buffer->used;
    403  10164  jyu_mit +	memcpy(p.record, buffer->data, buffer->used);
    404  10164  jyu_mit +	
    405  10164  jyu_mit +	pi_buffer_free(buffer); 
    406  10164  jyu_mit +#else
    407  10164  jyu_mit  	p.record = record;
    408  10164  jyu_mit  	p.length = pack_Appointment (local->appt, p.record, 0xffff);
    409  10164  jyu_mit -
    410  10164  jyu_mit +#endif
    411  10164  jyu_mit  	return p;	
    412  10164  jyu_mit  }
    413  10164  jyu_mit  
    414  10164  jyu_mit @@ -867,22 +901,44 @@
    415  10164  jyu_mit           * we don't overwrite them 
    416  10164  jyu_mit  	 */
    417  10164  jyu_mit  	if (local->local.ID != 0) {
    418  10164  jyu_mit +		int cat = 0;
    419  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    420  10164  jyu_mit +		struct Appointment appt;
    421  10164  jyu_mit +		pi_buffer_t * record;
    422  10164  jyu_mit +	
    423  10164  jyu_mit +		record = pi_buffer_new(DLP_BUF_SIZE);
    424  10164  jyu_mit +		if(record == NULL){
    425  10164  jyu_mit +			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    426  10164  jyu_mit +			return;
    427  10164  jyu_mit +		}
    428  10164  jyu_mit +#else
    429  10164  jyu_mit  		struct Appointment appt;		
    430  10164  jyu_mit  		char record[0xffff];
    431  10164  jyu_mit -		int cat = 0;
    432  10164  jyu_mit -		
    433  10164  jyu_mit +#endif	
    434  10164  jyu_mit  		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
    435  10164  jyu_mit  					ctxt->dbi->db_handle,
    436  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    437  10164  jyu_mit +					local->local.ID, record, 
    438  10164  jyu_mit +					NULL, NULL, &cat) > 0) {
    439  10164  jyu_mit +#else
    440  10164  jyu_mit  					local->local.ID, &record, 
    441  10164  jyu_mit  					NULL, NULL, NULL, &cat) > 0) {
    442  10164  jyu_mit +#endif
    443  10164  jyu_mit  			local->local.category = cat;
    444  10164  jyu_mit  			memset (&appt, 0, sizeof (struct Appointment));
    445  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    446  10164  jyu_mit +			unpack_Appointment (&appt, record, datebook_v1);
    447  10164  jyu_mit +#else
    448  10164  jyu_mit  			unpack_Appointment (&appt, record, 0xffff);
    449  10164  jyu_mit +#endif
    450  10164  jyu_mit  			local->appt->alarm = appt.alarm;
    451  10164  jyu_mit  			local->appt->advance = appt.advance;
    452  10164  jyu_mit  			local->appt->advanceUnits = appt.advanceUnits;
    453  10164  jyu_mit  			free_Appointment (&appt);
    454  10164  jyu_mit  		}
    455  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    456  10164  jyu_mit +		pi_buffer_free (record);
    457  10164  jyu_mit +#endif
    458  10164  jyu_mit  	}
    459  10164  jyu_mit  
    460  10164  jyu_mit  	/* STOP: don't replace these with g_strdup, since free_Appointment
    461  10164  jyu_mit @@ -1140,12 +1196,28 @@
    462  10164  jyu_mit  	GSList *edl = NULL;	
    463  10164  jyu_mit  	char *txt;
    464  10164  jyu_mit  	int pos, i;
    465  10164  jyu_mit -	
    466  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    467  10164  jyu_mit +	pi_buffer_t * buffer;
    468  10164  jyu_mit +#endif
    469  10164  jyu_mit  	g_return_val_if_fail (remote != NULL, NULL);
    470  10164  jyu_mit  
    471  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    472  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    473  10164  jyu_mit +	if(buffer == NULL){
    474  10164  jyu_mit +		return NULL;
    475  10164  jyu_mit +	}
    476  10164  jyu_mit +	
    477  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    478  10164  jyu_mit +		return NULL;
    479  10164  jyu_mit +	}
    480  10164  jyu_mit +
    481  10164  jyu_mit +	unpack_Appointment (&appt, buffer, datebook_v1);
    482  10164  jyu_mit +	pi_buffer_free(buffer);
    483  10164  jyu_mit +
    484  10164  jyu_mit +#else
    485  10164  jyu_mit  	memset (&appt, 0, sizeof (struct Appointment));
    486  10164  jyu_mit  	unpack_Appointment (&appt, remote->record, remote->length);
    487  10164  jyu_mit -
    488  10164  jyu_mit +#endif
    489  10164  jyu_mit  	if (in_comp == NULL) {
    490  10164  jyu_mit  		comp = e_cal_component_new ();
    491  10164  jyu_mit  		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
    492  10164  jyu_mit @@ -1413,7 +1485,9 @@
    493  10164  jyu_mit  	char *filename, *change_id;
    494  10164  jyu_mit  	icalcomponent *icalcomp;
    495  10164  jyu_mit  	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
    496  10164  jyu_mit -
    497  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    498  10164  jyu_mit +	pi_buffer_t * buffer;
    499  10164  jyu_mit +#endif
    500  10164  jyu_mit  	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
    501  10164  jyu_mit  
    502  10164  jyu_mit  	LOG (g_message ( "---------------------------------------------------------\n" ));
    503  10164  jyu_mit @@ -1521,10 +1595,21 @@
    504  10164  jyu_mit  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
    505  10164  jyu_mit  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
    506  10164  jyu_mit  
    507  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    508  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    509  10164  jyu_mit +	if(buffer == NULL){
    510  10164  jyu_mit +		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    511  10164  jyu_mit +		return -1;
    512  10164  jyu_mit +	}
    513  10164  jyu_mit +
    514  10164  jyu_mit + 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    515  10164  jyu_mit +				DLP_BUF_SIZE,
    516  10164  jyu_mit +				buffer);
    517  10164  jyu_mit +#else
    518  10164  jyu_mit  	buf = (unsigned char*)g_malloc (0xffff);
    519  10164  jyu_mit  	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    520  10164  jyu_mit  			      (unsigned char *)buf, 0xffff);
    521  10164  jyu_mit -	
    522  10164  jyu_mit +#endif
    523  10164  jyu_mit  	if (len < 0) {
    524  10164  jyu_mit  		WARN (_("Could not read pilot's Calendar application block"));
    525  10164  jyu_mit  		WARN ("dlp_ReadAppBlock(...) = %d", len);
    526  10164  jyu_mit @@ -1532,6 +1617,11 @@
    527  10164  jyu_mit  					   _("Could not read pilot's Calendar application block"));
    528  10164  jyu_mit  		return -1;
    529  10164  jyu_mit  	}
    530  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    531  10164  jyu_mit +	buf = g_new0 (unsigned char,buffer->used);
    532  10164  jyu_mit +	memcpy(buf, buffer->data, buffer->used);
    533  10164  jyu_mit +	pi_buffer_free(buffer);
    534  10164  jyu_mit +#endif
    535  10164  jyu_mit  	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
    536  10164  jyu_mit  	g_free (buf);
    537  10164  jyu_mit  
    538  10164  jyu_mit --- calendar/conduits/todo/todo-conduit.c-orig	2006-11-17 15:24:27.040351000 +0800
    539  10164  jyu_mit +++ calendar/conduits/todo/todo-conduit.c	2006-11-17 15:18:41.902434000 +0800
    540  10164  jyu_mit @@ -402,15 +402,30 @@
    541  10164  jyu_mit  {
    542  10164  jyu_mit  	static char buff[ 4096 ];
    543  10164  jyu_mit  	struct ToDo todo;
    544  10164  jyu_mit -
    545  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    546  10164  jyu_mit +	pi_buffer_t * buffer;
    547  10164  jyu_mit +#endif
    548  10164  jyu_mit  	if (remote == NULL) {
    549  10164  jyu_mit  		sprintf (buff, "[NULL]");
    550  10164  jyu_mit  		return buff;
    551  10164  jyu_mit  	}
    552  10164  jyu_mit  
    553  10164  jyu_mit  	memset (&todo, 0, sizeof (struct ToDo));
    554  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    555  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    556  10164  jyu_mit +	if(buffer == NULL){
    557  10164  jyu_mit +		sprintf (buff, "[NULL]");
    558  10164  jyu_mit +		return buff;
    559  10164  jyu_mit +	}
    560  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    561  10164  jyu_mit +		sprintf (buff, "[NULL]");
    562  10164  jyu_mit +		return buff;
    563  10164  jyu_mit +	}
    564  10164  jyu_mit +	unpack_ToDo (&todo, buffer, todo_v1);
    565  10164  jyu_mit +	pi_buffer_free(buffer);
    566  10164  jyu_mit +#else
    567  10164  jyu_mit  	unpack_ToDo (&todo, remote->record, remote->length);
    568  10164  jyu_mit -
    569  10164  jyu_mit +#endif
    570  10164  jyu_mit  	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
    571  10164  jyu_mit  		    todo.indefinite,
    572  10164  jyu_mit  		    mktime (&todo.due),
    573  10164  jyu_mit @@ -594,7 +609,11 @@
    574  10164  jyu_mit  			      EToDoConduitContext *ctxt)
    575  10164  jyu_mit  {
    576  10164  jyu_mit  	GnomePilotRecord p;
    577  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    578  10164  jyu_mit +	pi_buffer_t * buffer;
    579  10164  jyu_mit +#else
    580  10164  jyu_mit  	static char record[0xffff];
    581  10164  jyu_mit +#endif
    582  10164  jyu_mit  
    583  10164  jyu_mit  	g_assert (local->comp != NULL);
    584  10164  jyu_mit  	g_assert (local->todo != NULL );
    585  10164  jyu_mit @@ -607,10 +626,24 @@
    586  10164  jyu_mit  	p.archived = local->local.archived;
    587  10164  jyu_mit  	p.secret = local->local.secret;
    588  10164  jyu_mit  
    589  10164  jyu_mit -	/* Generate pilot record structure */
    590  10164  jyu_mit +	/* Generate pilot record structure */
    591  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    592  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    593  10164  jyu_mit +	if(buffer == NULL){
    594  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    595  10164  jyu_mit +		return p;
    596  10164  jyu_mit +	}
    597  10164  jyu_mit +
    598  10164  jyu_mit +	pack_ToDo (local->todo, buffer, todo_v1);
    599  10164  jyu_mit +	p.record = g_new0(unsigned char, buffer->used);
    600  10164  jyu_mit +	p.length = buffer->used;
    601  10164  jyu_mit +	memcpy(p.record, buffer->data, buffer->used);
    602  10164  jyu_mit +
    603  10164  jyu_mit +	pi_buffer_free(buffer); 
    604  10164  jyu_mit +#else
    605  10164  jyu_mit  	p.record = record;
    606  10164  jyu_mit  	p.length = pack_ToDo (local->todo, p.record, 0xffff);
    607  10164  jyu_mit -
    608  10164  jyu_mit +#endif
    609  10164  jyu_mit  	return p;	
    610  10164  jyu_mit  }
    611  10164  jyu_mit  
    612  10164  jyu_mit @@ -696,15 +729,32 @@
    613  10164  jyu_mit  
    614  10164  jyu_mit  	/* Don't overwrite the category */
    615  10164  jyu_mit  	if (local->local.ID != 0) {
    616  10164  jyu_mit -		char record[0xffff];
    617  10164  jyu_mit  		int cat = 0;
    618  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    619  10164  jyu_mit +		pi_buffer_t * record;
    620  10164  jyu_mit +		record = pi_buffer_new(DLP_BUF_SIZE);
    621  10164  jyu_mit +		if(record == NULL){
    622  10164  jyu_mit +			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    623  10164  jyu_mit +			return;
    624  10164  jyu_mit +		}
    625  10164  jyu_mit +#else
    626  10164  jyu_mit +		char record[0xffff];
    627  10164  jyu_mit +#endif
    628  10164  jyu_mit  		
    629  10164  jyu_mit  		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
    630  10164  jyu_mit  					ctxt->dbi->db_handle,
    631  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    632  10164  jyu_mit +					local->local.ID, record, 
    633  10164  jyu_mit +					NULL, NULL, &cat) > 0) {
    634  10164  jyu_mit +#else
    635  10164  jyu_mit  					local->local.ID, &record, 
    636  10164  jyu_mit  					NULL, NULL, NULL, &cat) > 0) {
    637  10164  jyu_mit +#endif
    638  10164  jyu_mit  			local->local.category = cat;
    639  10164  jyu_mit  		}
    640  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    641  10164  jyu_mit +		pi_buffer_free(record);
    642  10164  jyu_mit +#endif
    643  10164  jyu_mit  	}
    644  10164  jyu_mit  	
    645  10164  jyu_mit  	/*
    646  10164  jyu_mit @@ -860,11 +910,28 @@
    647  10164  jyu_mit  	int priority;
    648  10164  jyu_mit  	char *txt;
    649  10164  jyu_mit  	char *category;
    650  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    651  10164  jyu_mit +	pi_buffer_t * buffer;
    652  10164  jyu_mit +#endif
    653  10164  jyu_mit  	
    654  10164  jyu_mit  	g_return_val_if_fail (remote != NULL, NULL);
    655  10164  jyu_mit  
    656  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    657  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    658  10164  jyu_mit +	if(buffer == NULL){
    659  10164  jyu_mit +		return NULL;
    660  10164  jyu_mit +	}
    661  10164  jyu_mit +
    662  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    663  10164  jyu_mit +		return NULL;
    664  10164  jyu_mit +	}
    665  10164  jyu_mit +
    666  10164  jyu_mit +	unpack_ToDo (&todo, buffer, todo_v1);
    667  10164  jyu_mit +	pi_buffer_free(buffer);
    668  10164  jyu_mit +#else
    669  10164  jyu_mit  	memset (&todo, 0, sizeof (struct ToDo));
    670  10164  jyu_mit  	unpack_ToDo (&todo, remote->record, remote->length);
    671  10164  jyu_mit +#endif
    672  10164  jyu_mit  
    673  10164  jyu_mit  	utc_zone = icaltimezone_get_utc_timezone ();
    674  10164  jyu_mit  	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
    675  10164  jyu_mit @@ -1018,6 +1085,9 @@
    676  10164  jyu_mit  	char *filename, *change_id;
    677  10164  jyu_mit  	icalcomponent *icalcomp;
    678  10164  jyu_mit  	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
    679  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    680  10164  jyu_mit +	pi_buffer_t * buffer;
    681  10164  jyu_mit +#endif
    682  10164  jyu_mit  
    683  10164  jyu_mit  	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
    684  10164  jyu_mit  
    685  10164  jyu_mit @@ -1104,10 +1174,20 @@
    686  10164  jyu_mit  	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
    687  10164  jyu_mit  			num_records, add_records, mod_records, del_records);
    688  10164  jyu_mit  
    689  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    690  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    691  10164  jyu_mit +	if(buffer == NULL){
    692  10164  jyu_mit +		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    693  10164  jyu_mit +		return -1;
    694  10164  jyu_mit +	}
    695  10164  jyu_mit + 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    696  10164  jyu_mit +				DLP_BUF_SIZE,
    697  10164  jyu_mit +				buffer);
    698  10164  jyu_mit +#else
    699  10164  jyu_mit  	buf = (unsigned char*)g_malloc (0xffff);
    700  10164  jyu_mit  	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    701  10164  jyu_mit  			      (unsigned char *)buf, 0xffff);
    702  10164  jyu_mit -	
    703  10164  jyu_mit +#endif	
    704  10164  jyu_mit  	if (len < 0) {
    705  10164  jyu_mit  		WARN (_("Could not read pilot's ToDo application block"));
    706  10164  jyu_mit  		WARN ("dlp_ReadAppBlock(...) = %d", len);
    707  10164  jyu_mit @@ -1115,6 +1195,12 @@
    708  10164  jyu_mit  					   _("Could not read pilot's ToDo application block"));
    709  10164  jyu_mit  		return -1;
    710  10164  jyu_mit  	}
    711  10164  jyu_mit +
    712  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    713  10164  jyu_mit +	buf = g_new0 (unsigned char,buffer->used);
    714  10164  jyu_mit +	memcpy(buf, buffer->data,buffer->used);
    715  10164  jyu_mit +	pi_buffer_free(buffer);
    716  10164  jyu_mit +#endif
    717  10164  jyu_mit  	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
    718  10164  jyu_mit  	g_free (buf);
    719  10164  jyu_mit  	
    720  10164  jyu_mit --- calendar/conduits/memo/memo-conduit.c-orig	2006-11-17 15:24:47.093344000 +0800
    721  10164  jyu_mit +++ calendar/conduits/memo/memo-conduit.c	2006-11-17 14:51:21.654921000 +0800
    722  10164  jyu_mit @@ -331,6 +331,9 @@
    723  10164  jyu_mit  {
    724  10164  jyu_mit  	static char buff[ 64 ];
    725  10164  jyu_mit  	struct Memo memo;
    726  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    727  10164  jyu_mit +	pi_buffer_t *buffer;
    728  10164  jyu_mit +#endif
    729  10164  jyu_mit  
    730  10164  jyu_mit  	if (remote == NULL) {
    731  10164  jyu_mit  		sprintf (buff, "[NULL]");
    732  10164  jyu_mit @@ -338,8 +341,22 @@
    733  10164  jyu_mit  	}
    734  10164  jyu_mit  
    735  10164  jyu_mit  	memset (&memo, 0, sizeof (struct Memo));
    736  10164  jyu_mit -	unpack_Memo (&memo, remote->record, remote->length);
    737  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    738  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    739  10164  jyu_mit +	if(buffer == NULL){
    740  10164  jyu_mit +		sprintf (buff, "[NULL]");
    741  10164  jyu_mit +		return buff;
    742  10164  jyu_mit +	}
    743  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    744  10164  jyu_mit +		sprintf (buff, "[NULL]");
    745  10164  jyu_mit +		return buff;
    746  10164  jyu_mit +	}
    747  10164  jyu_mit +	unpack_Memo (&memo, buffer, memo_v1);
    748  10164  jyu_mit  
    749  10164  jyu_mit +	pi_buffer_free(buffer);
    750  10164  jyu_mit +#else
    751  10164  jyu_mit +	unpack_Memo (&memo, remote->record, remote->length);
    752  10164  jyu_mit +#endif
    753  10164  jyu_mit  	g_snprintf (buff, 64, "['%s']",
    754  10164  jyu_mit  		    memo.text ?
    755  10164  jyu_mit  		    memo.text : "");
    756  10164  jyu_mit @@ -452,6 +469,9 @@
    757  10164  jyu_mit  {
    758  10164  jyu_mit  	GnomePilotRecord p;
    759  10164  jyu_mit  	static char record[0xffff];
    760  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    761  10164  jyu_mit +	pi_buffer_t * buffer;
    762  10164  jyu_mit +#endif
    763  10164  jyu_mit  
    764  10164  jyu_mit  	g_assert (local->comp != NULL);
    765  10164  jyu_mit  	g_assert (local->memo != NULL );
    766  10164  jyu_mit @@ -465,9 +485,23 @@
    767  10164  jyu_mit  	p.secret = local->local.secret;
    768  10164  jyu_mit  
    769  10164  jyu_mit  	/* Generate pilot record structure */
    770  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    771  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    772  10164  jyu_mit +	if(buffer == NULL){
    773  10164  jyu_mit +		pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    774  10164  jyu_mit +		return p;
    775  10164  jyu_mit +	}
    776  10164  jyu_mit +
    777  10164  jyu_mit +	pack_Memo (local->memo, buffer, memo_v1);
    778  10164  jyu_mit +	p.record = g_new0(unsigned char, buffer->used);
    779  10164  jyu_mit +	p.length = buffer->used;
    780  10164  jyu_mit +	memcpy(p.record, buffer->data, buffer->used);
    781  10164  jyu_mit +
    782  10164  jyu_mit +	pi_buffer_free(buffer);
    783  10164  jyu_mit +#else
    784  10164  jyu_mit  	p.record = record;
    785  10164  jyu_mit  	p.length = pack_Memo (local->memo, p.record, 0xffff);
    786  10164  jyu_mit -
    787  10164  jyu_mit +#endif
    788  10164  jyu_mit  	return p;	
    789  10164  jyu_mit  }
    790  10164  jyu_mit  
    791  10164  jyu_mit @@ -568,16 +602,41 @@
    792  10164  jyu_mit  
    793  10164  jyu_mit  	/* Don't overwrite the category */
    794  10164  jyu_mit  	if (local->local.ID != 0) {
    795  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    796  10164  jyu_mit +		struct Memo memo;
    797  10164  jyu_mit +		pi_buffer_t * record;
    798  10164  jyu_mit +#else
    799  10164  jyu_mit  		char record[0xffff];
    800  10164  jyu_mit +#endif
    801  10164  jyu_mit  		int cat = 0;
    802  10164  jyu_mit  		
    803  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    804  10164  jyu_mit +		record = pi_buffer_new(DLP_BUF_SIZE);
    805  10164  jyu_mit +		if(record == NULL){
    806  10164  jyu_mit +			pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    807  10164  jyu_mit +			return;
    808  10164  jyu_mit +		}
    809  10164  jyu_mit +#endif
    810  10164  jyu_mit +
    811  10164  jyu_mit  		LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
    812  10164  jyu_mit  		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
    813  10164  jyu_mit  					ctxt->dbi->db_handle,
    814  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    815  10164  jyu_mit +					local->local.ID, record, 
    816  10164  jyu_mit +					NULL, NULL, &cat) > 0) {
    817  10164  jyu_mit +			local->local.category = cat;
    818  10164  jyu_mit +			memset (&memo, 0, sizeof (struct Memo));
    819  10164  jyu_mit +			unpack_Memo (&memo, record, memo_v1);
    820  10164  jyu_mit +			local->memo->text = strdup (memo.text);
    821  10164  jyu_mit +			free_Memo (&memo);
    822  10164  jyu_mit +		}
    823  10164  jyu_mit +		pi_buffer_free (record);
    824  10164  jyu_mit +#else
    825  10164  jyu_mit  					local->local.ID, &record, 
    826  10164  jyu_mit  					NULL, NULL, NULL, &cat) > 0) {
    827  10164  jyu_mit  			local->local.category = cat;
    828  10164  jyu_mit -		}
    829  10164  jyu_mit +		}	
    830  10164  jyu_mit +#endif
    831  10164  jyu_mit  		LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
    832  10164  jyu_mit  	}
    833  10164  jyu_mit  	
    834  10164  jyu_mit @@ -704,11 +763,27 @@
    835  10164  jyu_mit  	char *txt, *txt2, *txt3;
    836  10164  jyu_mit  	char *category;
    837  10164  jyu_mit  	int i;
    838  10164  jyu_mit -	
    839  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    840  10164  jyu_mit +	pi_buffer_t * buffer;
    841  10164  jyu_mit +#endif
    842  10164  jyu_mit  	g_return_val_if_fail (remote != NULL, NULL);
    843  10164  jyu_mit  
    844  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    845  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    846  10164  jyu_mit +	if(buffer == NULL){
    847  10164  jyu_mit +		return NULL;
    848  10164  jyu_mit +	}
    849  10164  jyu_mit +	
    850  10164  jyu_mit +	if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
    851  10164  jyu_mit +		return NULL;
    852  10164  jyu_mit +	}
    853  10164  jyu_mit +	
    854  10164  jyu_mit +	unpack_Memo (&memo, buffer, memo_v1);
    855  10164  jyu_mit +	pi_buffer_free(buffer);
    856  10164  jyu_mit +#else
    857  10164  jyu_mit  	memset (&memo, 0, sizeof (struct Memo));
    858  10164  jyu_mit  	unpack_Memo (&memo, remote->record, remote->length);
    859  10164  jyu_mit +#endif
    860  10164  jyu_mit  
    861  10164  jyu_mit  	utc_zone = icaltimezone_get_utc_timezone ();
    862  10164  jyu_mit  	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
    863  10164  jyu_mit @@ -840,6 +915,9 @@
    864  10164  jyu_mit  	char *filename, *change_id;
    865  10164  jyu_mit  	icalcomponent *icalcomp;
    866  10164  jyu_mit  	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
    867  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    868  10164  jyu_mit +	pi_buffer_t * buffer;
    869  10164  jyu_mit +#endif
    870  10164  jyu_mit  
    871  10164  jyu_mit  	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
    872  10164  jyu_mit  
    873  10164  jyu_mit @@ -929,10 +1007,21 @@
    874  10164  jyu_mit  	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
    875  10164  jyu_mit  		num_records, add_records, mod_records, del_records);
    876  10164  jyu_mit  
    877  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    878  10164  jyu_mit +	buffer = pi_buffer_new(DLP_BUF_SIZE);
    879  10164  jyu_mit +	if(buffer == NULL){
    880  10164  jyu_mit +		pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
    881  10164  jyu_mit +		return -1;
    882  10164  jyu_mit +	}
    883  10164  jyu_mit +
    884  10164  jyu_mit + 	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    885  10164  jyu_mit +				DLP_BUF_SIZE,
    886  10164  jyu_mit +				buffer);
    887  10164  jyu_mit +#else
    888  10164  jyu_mit  	buf = (unsigned char*)g_malloc (0xffff);
    889  10164  jyu_mit  	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
    890  10164  jyu_mit  			      (unsigned char *)buf, 0xffff);
    891  10164  jyu_mit -	
    892  10164  jyu_mit +#endif
    893  10164  jyu_mit  	if (len < 0) {
    894  10164  jyu_mit  		WARN (_("Could not read pilot's Memo application block"));
    895  10164  jyu_mit  		WARN ("dlp_ReadAppBlock(...) = %d", len);
    896  10164  jyu_mit @@ -940,7 +1029,15 @@
    897  10164  jyu_mit  					   _("Could not read pilot's Memo application block"));
    898  10164  jyu_mit  		return -1;
    899  10164  jyu_mit  	}
    900  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    901  10164  jyu_mit +	buf = g_new0 (unsigned char,buffer->used);
    902  10164  jyu_mit +	memcpy(buf, buffer->data, buffer->used);
    903  10164  jyu_mit + 	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
    904  10164  jyu_mit +	pi_buffer_free(buffer);
    905  10164  jyu_mit +#else
    906  10164  jyu_mit  	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
    907  10164  jyu_mit +#endif
    908  10164  jyu_mit +
    909  10164  jyu_mit  	g_free (buf);
    910  10164  jyu_mit  	
    911  10164  jyu_mit  	lastDesktopUniqueID = 128;
    912