2005-09-16 [colin] 1.9.14cvs35

	* src/jpilot.c
		Missed that one

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index a3af02be26486af162425fc7191e8c34f546ac1c..8bfebc0f032ec9c927fe1cae66822108e192efe1 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-09-16 [colin]     1.9.14cvs35
+
+       * src/jpilot.c
+               Missed that one
+

 2005-09-16 [colin]     1.9.14cvs34
 
        * configure.ac
 2005-09-16 [colin]     1.9.14cvs34
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 9e5f6350bf0623718c702abc33a3dd052d68dcba..433a0120942562329b1540236a06b11a77c1a0a4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -803,3 +803,4 @@
 ( cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/prefs_matcher.c;  ) > 1.9.14cvs32.patchset
 ( cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/addressbook.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ldapquery.c;  ) > 1.9.14cvs33.patchset
 ( cvs diff -u -r 1.654.2.844 -r 1.654.2.845 configure.ac;  cvs diff -u -r 1.155.2.31 -r 1.155.2.32 src/Makefile.am;  cvs diff -u -r 1.27.2.12 -r 1.27.2.13 src/addr_compl.c;  cvs diff -u -r 1.28.2.8 -r 1.28.2.9 src/addrindex.c;  cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/browseldap.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/editldap.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldaplocate.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/ldapquery.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapquery.h;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/ldapserver.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/ldapserver.h;  cvs diff -u -r 1.115.2.53 -r 1.115.2.54 src/main.c;  cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/matcher_parser_parse.y;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_themes.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/Makefile.am;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/description_window.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/trayicon/Makefile.am;  ) > 1.9.14cvs34.patchset
 ( cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/prefs_matcher.c;  ) > 1.9.14cvs32.patchset
 ( cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/addressbook.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ldapquery.c;  ) > 1.9.14cvs33.patchset
 ( cvs diff -u -r 1.654.2.844 -r 1.654.2.845 configure.ac;  cvs diff -u -r 1.155.2.31 -r 1.155.2.32 src/Makefile.am;  cvs diff -u -r 1.27.2.12 -r 1.27.2.13 src/addr_compl.c;  cvs diff -u -r 1.28.2.8 -r 1.28.2.9 src/addrindex.c;  cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/browseldap.c;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/editldap.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldaplocate.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/ldapquery.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapquery.h;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/ldapserver.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/ldapserver.h;  cvs diff -u -r 1.115.2.53 -r 1.115.2.54 src/main.c;  cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/matcher_parser_parse.y;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_themes.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/Makefile.am;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/description_window.c;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/trayicon/Makefile.am;  ) > 1.9.14cvs34.patchset

+( cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/jpilot.c;  ) > 1.9.14cvs35.patchset

diff --git a/configure.ac b/configure.ac
index e3b3738947d0a6e2c4f42da363a981b4e349f096..8ea97764a8b523fb627c9910f7d40ff7ce17dd1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/jpilot.c b/src/jpilot.c
index a8e9af9ab17e078aa7bd3c7c3fb7b69aec3ba9fe..5a3bb1e806631ab64c0bdd86cb6d3b977df805d8 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -1097,7 +1097,6 @@ static void jpilot_parse_label( JPilotFile *pilotFile, gchar *labelEntry, ItemPe
                strcpy( buffer, labelEntry );
                node = list = jpilot_parse_email( buffer );
                while( node ) {
                strcpy( buffer, labelEntry );
                node = list = jpilot_parse_email( buffer );
                while( node ) {

-                       gchar convertBuff[JPILOT_LEN_LABEL];

                        email = addritem_create_item_email();
                        addritem_email_set_address( email, node->data );
                        if (convert_charcode) {
                        email = addritem_create_item_email();
                        addritem_email_set_address( email, node->data );
                        if (convert_charcode) {