Home | History | Annotate | Download | only in patches
      1  10164  jyu_mit --- e-util/e-pilot-util.h.orig	2006-12-29 16:57:56.429202000 +0800
      2  10164  jyu_mit +++ e-util/e-pilot-util.h	2006-12-28 15:05:24.062281000 +0800
      3  10164  jyu_mit @@ -26,8 +26,8 @@
      4  10164  jyu_mit  #ifndef E_PILOT_UTIL_H
      5  10164  jyu_mit  #define E_PILOT_UTIL_H
      6  10164  jyu_mit  
      7  10164  jyu_mit -char *e_pilot_utf8_to_pchar (const char *string);
      8  10164  jyu_mit -char *e_pilot_utf8_from_pchar (const char *string);
      9  10164  jyu_mit +char *e_pilot_utf8_to_pchar   (const char *string, const char *pilot_charset);
     10  10164  jyu_mit +char *e_pilot_utf8_from_pchar (const char *string, const char *pilot_charset);
     11  10164  jyu_mit  
     12  10164  jyu_mit  ESource *e_pilot_get_sync_source (ESourceList *source_list);
     13  10164  jyu_mit  void e_pilot_set_sync_source (ESourceList *source_list, ESource *source);
     14  10164  jyu_mit --- e-util/e-pilot-util.c.orig	2006-12-29 16:58:06.396943000 +0800
     15  10164  jyu_mit +++ e-util/e-pilot-util.c	2006-12-28 15:05:24.057859000 +0800
     16  10164  jyu_mit @@ -29,16 +29,19 @@
     17  10164  jyu_mit  #include "e-pilot-util.h"
     18  10164  jyu_mit  
     19  10164  jyu_mit  char *
     20  10164  jyu_mit -e_pilot_utf8_to_pchar (const char *string)
     21  10164  jyu_mit +e_pilot_utf8_to_pchar (const char *string, const char *pilot_charset)
     22  10164  jyu_mit  {
     23  10164  jyu_mit  	char *pstring = NULL;
     24  10164  jyu_mit  	int res;
     25  10164  jyu_mit  
     26  10164  jyu_mit  	if (!string)
     27  10164  jyu_mit  		return NULL;
     28  10164  jyu_mit -	
     29  10164  jyu_mit -	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
     30  10164  jyu_mit  
     31  10164  jyu_mit +#ifdef PILOT_LINK_0_12
     32  10164  jyu_mit +	res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string), &pstring, pilot_charset);
     33  10164  jyu_mit +#else
     34  10164  jyu_mit +	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
     35  10164  jyu_mit +#endif
     36  10164  jyu_mit  	if (res != 0)
     37  10164  jyu_mit  		pstring = strdup (string);
     38  10164  jyu_mit  
     39  10164  jyu_mit @@ -46,16 +49,20 @@
     40  10164  jyu_mit  }
     41  10164  jyu_mit  
     42  10164  jyu_mit  char *
     43  10164  jyu_mit -e_pilot_utf8_from_pchar (const char *string)
     44  10164  jyu_mit +e_pilot_utf8_from_pchar (const char *string, const char *pilot_charset)
     45  10164  jyu_mit  {
     46  10164  jyu_mit  	char *ustring = NULL;
     47  10164  jyu_mit  	int res;
     48  10164  jyu_mit  
     49  10164  jyu_mit  	if (!string)
     50  10164  jyu_mit  		return NULL;
     51  10164  jyu_mit -	
     52  10164  jyu_mit +
     53  10164  jyu_mit +#ifdef	PILOT_LINK_0_12
     54  10164  jyu_mit +	res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string), &ustring, pilot_charset);
     55  10164  jyu_mit +#else
     56  10164  jyu_mit  	res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
     57  10164  jyu_mit -	
     58  10164  jyu_mit +#endif
     59  10164  jyu_mit +
     60  10164  jyu_mit  	if (res != 0)
     61  10164  jyu_mit  		ustring = strdup (string);
     62  10164  jyu_mit  	
     63  10164  jyu_mit --- addressbook/conduit/address-conduit.c.orig	2006-12-29 16:56:06.492195000 +0800
     64  10164  jyu_mit +++ addressbook/conduit/address-conduit.c	2006-12-29 16:25:38.535634000 +0800
     65  10164  jyu_mit @@ -63,6 +63,8 @@
     66  10164  jyu_mit  #define WARN g_warning
     67  10164  jyu_mit  #define INFO g_message
     68  10164  jyu_mit  
     69  10164  jyu_mit +gchar *pilot_charset = NULL;
     70  10164  jyu_mit +
     71  10164  jyu_mit  enum {
     72  10164  jyu_mit  	LABEL_WORK,
     73  10164  jyu_mit  	LABEL_HOME,
     74  10164  jyu_mit @@ -750,7 +752,7 @@
     75  10164  jyu_mit  	char *text = NULL;
     76  10164  jyu_mit  	
     77  10164  jyu_mit  	if (address.entry[entry])
     78  10164  jyu_mit -		text = e_pilot_utf8_from_pchar (address.entry[entry]);
     79  10164  jyu_mit +		text = e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
     80  10164  jyu_mit  
     81  10164  jyu_mit  	e_contact_set (contact, field, text);
     82  10164  jyu_mit  	
     83  10164  jyu_mit @@ -761,7 +763,7 @@
     84  10164  jyu_mit  get_entry_text (struct Address address, int entry)
     85  10164  jyu_mit  {
     86  10164  jyu_mit  	if (address.entry[entry])
     87  10164  jyu_mit -		return e_pilot_utf8_from_pchar (address.entry[entry]);
     88  10164  jyu_mit +		return e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
     89  10164  jyu_mit  
     90  10164  jyu_mit  	return NULL;	
     91  10164  jyu_mit  }
     92  10164  jyu_mit @@ -917,10 +919,10 @@
     93  10164  jyu_mit  #endif
     94  10164  jyu_mit  	}
     95  10164  jyu_mit  
     96  10164  jyu_mit -	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
     97  10164  jyu_mit -	local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME));
     98  10164  jyu_mit -	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG));
     99  10164  jyu_mit -	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE));
    100  10164  jyu_mit +	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME), pilot_charset);
    101  10164  jyu_mit +	local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME), pilot_charset);
    102  10164  jyu_mit +	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG), pilot_charset);
    103  10164  jyu_mit +	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE), pilot_charset);
    104  10164  jyu_mit  	
    105  10164  jyu_mit  	/* See if the default has something in it */
    106  10164  jyu_mit  	if ((address = e_contact_get (contact, ctxt->cfg->default_address))) {
    107  10164  jyu_mit @@ -946,13 +948,13 @@
    108  10164  jyu_mit  			add = g_strdup (address->street);
    109  10164  jyu_mit  			LOG (g_warning ("Address has only one line: [%s]\n", add));
    110  10164  jyu_mit  		}
    111  10164  jyu_mit -		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add);
    112  10164  jyu_mit +		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add, pilot_charset);
    113  10164  jyu_mit  		g_free (add);
    114  10164  jyu_mit  		
    115  10164  jyu_mit -		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality);
    116  10164  jyu_mit -		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region);
    117  10164  jyu_mit -		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code);
    118  10164  jyu_mit -		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country);
    119  10164  jyu_mit +		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality, pilot_charset);
    120  10164  jyu_mit +		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region, pilot_charset);
    121  10164  jyu_mit +		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code, pilot_charset);
    122  10164  jyu_mit +		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country, pilot_charset);
    123  10164  jyu_mit  		
    124  10164  jyu_mit  		e_contact_address_free (address);
    125  10164  jyu_mit  	}
    126  10164  jyu_mit @@ -973,7 +975,7 @@
    127  10164  jyu_mit  			phone_str = e_contact_get_const (contact, priority[i]);
    128  10164  jyu_mit  			if (phone_str && *phone_str) {
    129  10164  jyu_mit  				clear_entry_text (*local->addr, phone);
    130  10164  jyu_mit -				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
    131  10164  jyu_mit +				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str, pilot_charset);
    132  10164  jyu_mit  				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
    133  10164  jyu_mit  				phone++;
    134  10164  jyu_mit  			}
    135  10164  jyu_mit @@ -1022,13 +1024,13 @@
    136  10164  jyu_mit  			
    137  10164  jyu_mit  			if (phone_str && *phone_str) {
    138  10164  jyu_mit  				clear_entry_text (*local->addr, i);
    139  10164  jyu_mit -				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
    140  10164  jyu_mit +				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str, pilot_charset);
    141  10164  jyu_mit  			}
    142  10164  jyu_mit  		}
    143  10164  jyu_mit  	}
    144  10164  jyu_mit  	
    145  10164  jyu_mit  	/* Note */
    146  10164  jyu_mit -	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE));
    147  10164  jyu_mit +	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE), pilot_charset);
    148  10164  jyu_mit  }
    149  10164  jyu_mit  
    150  10164  jyu_mit  static void 
    151  10164  jyu_mit @@ -1301,6 +1303,13 @@
    152  10164  jyu_mit  	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */
    153  10164  jyu_mit  
    154  10164  jyu_mit  	ctxt->dbi = dbi;
    155  10164  jyu_mit +
    156  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    157  10164  jyu_mit +	if(NULL == dbi->pilotInfo->sync_options.pilot_charset)
    158  10164  jyu_mit +		pilot_charset = NULL;
    159  10164  jyu_mit +	else
    160  10164  jyu_mit +		pilot_charset = g_strdup(dbi->pilotInfo->sync_options.pilot_charset);
    161  10164  jyu_mit +#endif
    162  10164  jyu_mit  	
    163  10164  jyu_mit  	if (ctxt->cfg->source) {
    164  10164  jyu_mit  		ctxt->ebook = e_book_new (ctxt->cfg->source, NULL);
    165  10164  jyu_mit @@ -1438,7 +1447,8 @@
    166  10164  jyu_mit  	if (e_book_get_changes (ctxt->ebook, change_id, &changed, NULL))
    167  10164  jyu_mit  		e_book_free_change_list (changed);
    168  10164  jyu_mit  	g_free (change_id);
    169  10164  jyu_mit -
    170  10164  jyu_mit +	if (pilot_charset)
    171  10164  jyu_mit +		g_free (pilot_charset);
    172  10164  jyu_mit  	LOG (g_message ( "---------------------------------------------------------\n" ));
    173  10164  jyu_mit  	
    174  10164  jyu_mit  	return 0;
    175  10164  jyu_mit --- calendar/conduits/calendar/calendar-conduit.c.orig	2006-12-29 16:56:33.574041000 +0800
    176  10164  jyu_mit +++ calendar/conduits/calendar/calendar-conduit.c	2006-12-29 16:23:25.391507000 +0800
    177  10164  jyu_mit @@ -60,6 +60,8 @@
    178  10164  jyu_mit  #define WARN g_warning
    179  10164  jyu_mit  #define INFO g_message
    180  10164  jyu_mit  
    181  10164  jyu_mit +gchar *pilot_charset = NULL;
    182  10164  jyu_mit +
    183  10164  jyu_mit  #define PILOT_MAX_ADVANCE 99
    184  10164  jyu_mit  
    185  10164  jyu_mit  typedef struct _ECalLocalRecord ECalLocalRecord;
    186  10164  jyu_mit @@ -945,13 +947,13 @@
    187  10164  jyu_mit  	   uses free to deallocate */
    188  10164  jyu_mit  	e_cal_component_get_summary (comp, &summary);
    189  10164  jyu_mit  	if (summary.value) 
    190  10164  jyu_mit -		local->appt->description = e_pilot_utf8_to_pchar (summary.value);
    191  10164  jyu_mit +		local->appt->description = e_pilot_utf8_to_pchar (summary.value, pilot_charset);
    192  10164  jyu_mit  
    193  10164  jyu_mit  	e_cal_component_get_description_list (comp, &d_list);
    194  10164  jyu_mit  	if (d_list) {
    195  10164  jyu_mit  		description = (ECalComponentText *) d_list->data;
    196  10164  jyu_mit  		if (description && description->value)
    197  10164  jyu_mit -			local->appt->note = e_pilot_utf8_to_pchar (description->value);
    198  10164  jyu_mit +			local->appt->note = e_pilot_utf8_to_pchar (description->value, pilot_charset);
    199  10164  jyu_mit  		else
    200  10164  jyu_mit  			local->appt->note = NULL;
    201  10164  jyu_mit  	} else {
    202  10164  jyu_mit @@ -1228,7 +1230,7 @@
    203  10164  jyu_mit  
    204  10164  jyu_mit  	e_cal_component_set_last_modified (comp, &now);
    205  10164  jyu_mit  
    206  10164  jyu_mit -	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
    207  10164  jyu_mit +	summary.value = txt = e_pilot_utf8_from_pchar (appt.description, pilot_charset);
    208  10164  jyu_mit  	e_cal_component_set_summary (comp, &summary);
    209  10164  jyu_mit  	free (txt);
    210  10164  jyu_mit  
    211  10164  jyu_mit @@ -1239,7 +1241,7 @@
    212  10164  jyu_mit  		GSList l;
    213  10164  jyu_mit  		ECalComponentText text;
    214  10164  jyu_mit  
    215  10164  jyu_mit -		text.value = txt = e_pilot_utf8_from_pchar (appt.note);
    216  10164  jyu_mit +		text.value = txt = e_pilot_utf8_from_pchar (appt.note, pilot_charset);
    217  10164  jyu_mit  		text.altrep = NULL;
    218  10164  jyu_mit  		l.data = &text;
    219  10164  jyu_mit  		l.next = NULL;
    220  10164  jyu_mit @@ -1494,6 +1496,12 @@
    221  10164  jyu_mit  	LOG (g_message ( "pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
    222  10164  jyu_mit  
    223  10164  jyu_mit  	ctxt->dbi = dbi;	
    224  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    225  10164  jyu_mit +	if(NULL == dbi->pilotInfo->sync_options.pilot_charset)
    226  10164  jyu_mit +		pilot_charset = NULL;
    227  10164  jyu_mit +	else
    228  10164  jyu_mit +		 pilot_charset = g_strdup(dbi->pilotInfo->sync_options.pilot_charset);
    229  10164  jyu_mit +#endif
    230  10164  jyu_mit  	ctxt->client = NULL;
    231  10164  jyu_mit  
    232  10164  jyu_mit  	/* Get the timezone */
    233  10164  jyu_mit @@ -1658,6 +1666,8 @@
    234  10164  jyu_mit  	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
    235  10164  jyu_mit  		e_cal_free_change_list (changed);
    236  10164  jyu_mit  	g_free (change_id);
    237  10164  jyu_mit +	if (pilot_charset)
    238  10164  jyu_mit +		g_free (pilot_charset);
    239  10164  jyu_mit  	
    240  10164  jyu_mit  	LOG (g_message ( "---------------------------------------------------------\n" ));
    241  10164  jyu_mit  
    242  10164  jyu_mit --- calendar/conduits/todo/todo-conduit.c.orig	2006-12-29 16:57:11.237457000 +0800
    243  10164  jyu_mit +++ calendar/conduits/todo/todo-conduit.c	2006-12-29 16:25:01.553824000 +0800
    244  10164  jyu_mit @@ -65,6 +65,8 @@
    245  10164  jyu_mit  #define WARN g_warning
    246  10164  jyu_mit  #define INFO g_message
    247  10164  jyu_mit  
    248  10164  jyu_mit +gchar *pilot_charset = NULL;
    249  10164  jyu_mit +
    250  10164  jyu_mit  typedef struct _EToDoLocalRecord EToDoLocalRecord;
    251  10164  jyu_mit  typedef struct _EToDoConduitCfg EToDoConduitCfg;
    252  10164  jyu_mit  typedef struct _EToDoConduitGui EToDoConduitGui;
    253  10164  jyu_mit @@ -798,13 +800,13 @@
    254  10164  jyu_mit  	   uses free to deallocate */
    255  10164  jyu_mit  	e_cal_component_get_summary (comp, &summary);
    256  10164  jyu_mit  	if (summary.value) 
    257  10164  jyu_mit -		local->todo->description = e_pilot_utf8_to_pchar (summary.value);
    258  10164  jyu_mit +		local->todo->description = e_pilot_utf8_to_pchar (summary.value, pilot_charset);
    259  10164  jyu_mit  
    260  10164  jyu_mit  	e_cal_component_get_description_list (comp, &d_list);
    261  10164  jyu_mit  	if (d_list) {
    262  10164  jyu_mit  		description = (ECalComponentText *) d_list->data;
    263  10164  jyu_mit  		if (description && description->value)
    264  10164  jyu_mit -			local->todo->note = e_pilot_utf8_to_pchar (description->value);
    265  10164  jyu_mit +			local->todo->note = e_pilot_utf8_to_pchar (description->value, pilot_charset);
    266  10164  jyu_mit  		else
    267  10164  jyu_mit  			local->todo->note = NULL;
    268  10164  jyu_mit  	} else {
    269  10164  jyu_mit @@ -947,7 +949,7 @@
    270  10164  jyu_mit  
    271  10164  jyu_mit  	e_cal_component_set_last_modified (comp, &now);
    272  10164  jyu_mit  
    273  10164  jyu_mit -	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
    274  10164  jyu_mit +	summary.value = txt = e_pilot_utf8_from_pchar (todo.description, pilot_charset);
    275  10164  jyu_mit  	e_cal_component_set_summary (comp, &summary);
    276  10164  jyu_mit  	free (txt);
    277  10164  jyu_mit  	
    278  10164  jyu_mit @@ -958,7 +960,7 @@
    279  10164  jyu_mit  		GSList l;
    280  10164  jyu_mit  		ECalComponentText text;
    281  10164  jyu_mit  
    282  10164  jyu_mit -		text.value = txt = e_pilot_utf8_from_pchar (todo.note);
    283  10164  jyu_mit +		text.value = txt = e_pilot_utf8_from_pchar (todo.note, pilot_charset);
    284  10164  jyu_mit  		text.altrep = NULL;
    285  10164  jyu_mit  		l.data = &text;
    286  10164  jyu_mit  		l.next = NULL;
    287  10164  jyu_mit @@ -1098,6 +1100,13 @@
    288  10164  jyu_mit  	ctxt->dbi = dbi;	
    289  10164  jyu_mit  	ctxt->client = NULL;
    290  10164  jyu_mit  
    291  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    292  10164  jyu_mit +	if(NULL == dbi->pilotInfo->sync_options.pilot_charset)
    293  10164  jyu_mit +		pilot_charset = NULL;
    294  10164  jyu_mit +	else
    295  10164  jyu_mit +		pilot_charset = g_strdup(dbi->pilotInfo->sync_options.pilot_charset);
    296  10164  jyu_mit +#endif
    297  10164  jyu_mit +
    298  10164  jyu_mit  	/* Get the timezone */
    299  10164  jyu_mit  	ctxt->timezone = get_default_timezone ();
    300  10164  jyu_mit  	if (ctxt->timezone == NULL)
    301  10164  jyu_mit @@ -1259,7 +1268,8 @@
    302  10164  jyu_mit  	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
    303  10164  jyu_mit  		e_cal_free_change_list (changed);
    304  10164  jyu_mit  	g_free (change_id);
    305  10164  jyu_mit -	
    306  10164  jyu_mit +	if (pilot_charset)
    307  10164  jyu_mit +		g_free (pilot_charset);	
    308  10164  jyu_mit  	LOG (g_message ( "---------------------------------------------------------\n" ));
    309  10164  jyu_mit  
    310  10164  jyu_mit  	return 0;
    311  10164  jyu_mit --- calendar/conduits/memo/memo-conduit.c.orig	2006-12-29 17:09:14.347437000 +0800
    312  10164  jyu_mit +++ calendar/conduits/memo/memo-conduit.c	2006-12-29 17:11:04.095005000 +0800
    313  10164  jyu_mit @@ -63,6 +63,8 @@
    314  10164  jyu_mit  #define WARN g_warning
    315  10164  jyu_mit  #define INFO g_message
    316  10164  jyu_mit  
    317  10164  jyu_mit +gchar *pilot_charset = NULL;
    318  10164  jyu_mit +
    319  10164  jyu_mit  typedef struct _EMemoLocalRecord EMemoLocalRecord;
    320  10164  jyu_mit  typedef struct _EMemoConduitCfg EMemoConduitCfg;
    321  10164  jyu_mit  typedef struct _EMemoConduitGui EMemoConduitGui;
    322  10164  jyu_mit @@ -693,7 +695,7 @@
    323  10164  jyu_mit  	if (d_list) {
    324  10164  jyu_mit  		description = (ECalComponentText *) d_list->data;
    325  10164  jyu_mit  		if (description && description->value){
    326  10164  jyu_mit -			local->memo->text = e_pilot_utf8_to_pchar (description->value);
    327  10164  jyu_mit +			local->memo->text = e_pilot_utf8_to_pchar (description->value, pilot_charset);
    328  10164  jyu_mit  		}
    329  10164  jyu_mit  		else{
    330  10164  jyu_mit  			local->memo->text = NULL;
    331  10164  jyu_mit @@ -831,10 +833,10 @@
    332  10164  jyu_mit  			
    333  10164  jyu_mit  		}
    334  10164  jyu_mit  
    335  10164  jyu_mit -		sumText.value = txt3 = e_pilot_utf8_from_pchar(txt2);
    336  10164  jyu_mit +		sumText.value = txt3 = e_pilot_utf8_from_pchar(txt2, pilot_charset);
    337  10164  jyu_mit  		sumText.altrep = NULL;
    338  10164  jyu_mit  
    339  10164  jyu_mit -		text.value = txt = e_pilot_utf8_from_pchar (memo.text);
    340  10164  jyu_mit +		text.value = txt = e_pilot_utf8_from_pchar (memo.text, pilot_charset);
    341  10164  jyu_mit  		text.altrep = NULL;
    342  10164  jyu_mit  		l.data = &text;
    343  10164  jyu_mit  		l.next = NULL;
    344  10164  jyu_mit @@ -928,6 +930,13 @@
    345  10164  jyu_mit  	ctxt->dbi = dbi;	
    346  10164  jyu_mit  	ctxt->client = NULL;
    347  10164  jyu_mit  	
    348  10164  jyu_mit +#ifdef PILOT_LINK_0_12
    349  10164  jyu_mit +	if(NULL == dbi->pilotInfo->sync_options.pilot_charset)
    350  10164  jyu_mit +		pilot_charset = NULL;
    351  10164  jyu_mit +	else
    352  10164  jyu_mit +		pilot_charset = g_strdup(dbi->pilotInfo->sync_options.pilot_charset);
    353  10164  jyu_mit +#endif
    354  10164  jyu_mit +
    355  10164  jyu_mit  	if (start_calendar_server (ctxt) != 0) {
    356  10164  jyu_mit  		WARN(_("Could not start evolution-data-server"));
    357  10164  jyu_mit  		gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
    358  10164  jyu_mit @@ -1095,7 +1104,8 @@
    359  10164  jyu_mit  	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
    360  10164  jyu_mit  		e_cal_free_change_list (changed);
    361  10164  jyu_mit  	g_free (change_id);
    362  10164  jyu_mit -	
    363  10164  jyu_mit +	if (pilot_charset)
    364  10164  jyu_mit +		g_free (pilot_charset);
    365  10164  jyu_mit  	LOG (g_message ( "---------------------------------------------------------\n" ));
    366  10164  jyu_mit  
    367  10164  jyu_mit  	return 0;
    368