CVS: sylpheedclaws/sylpheed-claws PATCHSETS,1.1.2.2172,1.1.2.2173 ChangeLog,1.396.2.1274,1.396.2.1275 configure.ac,1.654.2.2215,1.654.2.2216

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws
In directory sunsite.dk:/tmp/cvs-serv11541

Modified Files:
      Tag: gtk2
	PATCHSETS ChangeLog configure.ac 
Log Message:
2006-12-19 [colin]	2.6.1cvs54

	* src/jpilot.c
		Fix bug 1059, 'Better jpilot charset 
		handling'. Use libpisync's charset conversion
		if possible

Index: PATCHSETS
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/PATCHSETS,v
retrieving revision 1.1.2.2172
retrieving revision 1.1.2.2173
diff -u -d -r1.1.2.2172 -r1.1.2.2173
--- PATCHSETS	2006/12/19 17:28:26	1.1.2.2172
+++ PATCHSETS	2006/12/19 18:08:48	1.1.2.2173
@@ -2161,3 +2161,4 @@
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_receive.c;  ) > 2.6.1cvs51.patchset
 ( cvs diff -u -r 1.4.2.45 -r 1.4.2.46 src/gtk/about.c;  ) > 2.6.1cvs52.patchset
 ( cvs diff -u -r 1.42.2.28 -r 1.42.2.29 po/fr.po;  ) > 2.6.1cvs53.patchset
+( cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/jpilot.c;  ) > 2.6.1cvs54.patchset

Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/ChangeLog,v
retrieving revision 1.396.2.1274
retrieving revision 1.396.2.1275
diff -u -d -r1.396.2.1274 -r1.396.2.1275
--- ChangeLog	2006/12/19 17:28:28	1.396.2.1274
+++ ChangeLog	2006/12/19 18:08:50	1.396.2.1275
@@ -1,3 +1,10 @@
+2006-12-19 [colin]	2.6.1cvs54
+
+	* src/jpilot.c
+		Fix bug 1059, 'Better jpilot charset 
+		handling'. Use libpisync's charset conversion
+		if possible
+
 2006-12-19 [colin]	2.6.1cvs53
 
 	* po/fr.po

Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/configure.ac,v
retrieving revision 1.654.2.2215
retrieving revision 1.654.2.2216
diff -u -d -r1.654.2.2215 -r1.654.2.2216
--- configure.ac	2006/12/19 17:28:32	1.654.2.2215
+++ configure.ac	2006/12/19 18:08:53	1.654.2.2216
@@ -11,7 +11,7 @@
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -587,7 +587,7 @@
 				   AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
 	fi
 
-	AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
+	AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock -lpisync"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
 	if test x"$ac_cv_enable_jpilot" = xyes; then
 		AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.)
 	else