2004-12-16 [paul] 0.9.13cvs19

	* ChangeLog
	* ChangeLog.jp
	* NEWS
	* src/compose.c
	* src/syldap.c
		sync with main 1.0.0rc
		see ChangeLog 2004-12-15

diff --git a/ChangeLog b/ChangeLog
index b195e6fa2a052fc2ae139bd46ff2a1804fff2aea..9ee05623b47ea9de3b993b498ca9e98bca977227 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2004-12-16
+
+       * INSTALL
+         INSTALL.jp: updated the confirmation list.
+
+2004-12-15
+
+       * version 1.0.0rc
+
+2004-12-15
+
+       * src/compose.c: compose_wrap_line_all_full(): fixed the logic of
+         space insertion.
+
+2004-12-15
+
+       * manual/ja/sylpheed.sgml: updated.
+
+2004-12-15
+
+       * src/addrbook.c
+         src/addressbook.c
+         src/addrindex.c
+         src/jpilot.c
+         src/ldif.c
+         src/syldap.c
+         src/vcard.c: removed '... defined but not used' warnings.
+

 2004-12-13
 
        * src/compose.c: compose_wrap_line_all_full(): only insert space
 2004-12-13
 
        * src/compose.c: compose_wrap_line_all_full(): only insert space

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 26fb1cc7a7f65e97579ebeed522bb0f3f6b3fb4a..813166807d11a5260cc5599280e928bda45855a0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2004-12-16 [paul]      0.9.13cvs19
+
+       * ChangeLog
+       * ChangeLog.jp
+       * NEWS
+       * src/compose.c
+       * src/syldap.c
+               sync with main 1.0.0rc
+               see ChangeLog 2004-12-15
+

 2004-12-14 [colin]     0.9.13cvs18
 
        * src/gtk/prefswindow.c
 2004-12-14 [colin]     0.9.13cvs18
 
        * src/gtk/prefswindow.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 387ac2175314a1055524121b147629edb3321f51..db0e11244d30c33e10a77f4a0d4bc831bf2320cd 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,26 @@
+2004-12-15
+
+       * version 1.0.0rc
+
+2004-12-15
+
+       * src/compose.c: compose_wrap_line_all_full(): ¶õÇòÁÞÆþ¤Î¥í¥¸¥Ã¥¯¤ò
+         ½¤Àµ¡£
+
+2004-12-15
+
+       * manual/ja/sylpheed.sgml: ¹¹¿·¡£
+
+2004-12-15
+
+       * src/addrbook.c
+         src/addressbook.c
+         src/addrindex.c
+         src/jpilot.c
+         src/ldif.c
+         src/syldap.c
+         src/vcard.c: '... defined but not used' ¤Î·Ù¹ð¤ò½üµî¡£
+

 2004-12-13
 
        * src/compose.c: compose_wrap_line_all_full(): ¼¡¤Î¹Ô¤ÎºÇ½é¤Îʸ»ú¤¬
 2004-12-13
 
        * src/compose.c: compose_wrap_line_all_full(): ¼¡¤Î¹Ô¤ÎºÇ½é¤Îʸ»ú¤¬

diff --git a/NEWS b/NEWS
index 363451add3ba7493f30629a8167032ed7fe6a13a..1e8f243cc63d51e7b2c68976ec8c34fe05aef585 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 Changes of Sylpheed
 
 Changes of Sylpheed
 

+* 1.0.0rc
+
+    * The IMAP4 parser has been fixed for 64-bit platforms.
+    * Users are now asked to switch to online mode when sending in offline.
+    * The line-joining problem of auto-wrapping has been fixed.
+    * Special characters are now properly escaped when executing action
+      commands.
+    * Some compiler warnings have been removed.
+

 * 1.0.0beta4
 
     * The Japanese manual has been updated.
 * 1.0.0beta4
 
     * The Japanese manual has been updated.

diff --git a/PATCHSETS b/PATCHSETS
index 8bc0e16d597d36595616cbadcb3e92bf90b1fd50..45da540704c872ec7cd3666bd3ed96844191443d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -188,3 +188,4 @@
 ( cvs diff -u -r 1.449 -r 1.450 ChangeLog; cvs diff -u -r 1.444 -r 1.445 ChangeLog.jp; cvs diff -u -r 1.18 -r 1.19 src/action.c; cvs diff -u -r 1.463 -r 1.464 src/compose.c; cvs diff -u -r 1.60 -r 1.61 src/common/utils.c; ) > 0.9.13cvs16.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/gtkutils.c; cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkutils.h; cvs diff -u -r 1.18 -r 1.19 src/gtk/prefswindow.c; ) > 0.9.13cvs17.patchset
 ( cvs diff -u -r 1.19 -r 1.20 src/gtk/prefswindow.c; ) > 0.9.13cvs18.patchset
 ( cvs diff -u -r 1.449 -r 1.450 ChangeLog; cvs diff -u -r 1.444 -r 1.445 ChangeLog.jp; cvs diff -u -r 1.18 -r 1.19 src/action.c; cvs diff -u -r 1.463 -r 1.464 src/compose.c; cvs diff -u -r 1.60 -r 1.61 src/common/utils.c; ) > 0.9.13cvs16.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/gtkutils.c; cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkutils.h; cvs diff -u -r 1.18 -r 1.19 src/gtk/prefswindow.c; ) > 0.9.13cvs17.patchset
 ( cvs diff -u -r 1.19 -r 1.20 src/gtk/prefswindow.c; ) > 0.9.13cvs18.patchset

+( cvs diff -u -r 1.450 -r 1.451 ChangeLog; cvs diff -u -r 1.445 -r 1.446 ChangeLog.jp; cvs diff -u -r 1.53 -r 1.54 NEWS; cvs diff -u -r 1.464 -r 1.465 src/compose.c; cvs diff -u -r 1.16 -r 1.17 src/syldap.c; ) > 0.9.13cvs19.patchset

diff --git a/configure.ac b/configure.ac
index acda20696934f72842fadc43a1e384bd4f49366f..c9fcc6993e34fe61da09ee91e1eff43c95487048 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=18
+EXTRA_VERSION=19

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index f16640294d921be28e80bc24a5458694f5556610..fd1eacafd5333164675038fadd41eba9fa097578 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2768,7 +2768,7 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                                        GET_CHAR(cur_pos - 1, cb_prev,
                                                 clen_prev);
 
                                        GET_CHAR(cur_pos - 1, cb_prev,
                                                 clen_prev);

-                                       if (clen_prev != clen ||
+                                       if ((clen_prev != clen && clen > 1) ||

                                            (clen == 1 &&
                                             !isspace((guchar)cb[0]))) {
                                                gtk_stext_insert
                                            (clen == 1 &&
                                             !isspace((guchar)cb[0]))) {
                                                gtk_stext_insert

diff --git a/src/syldap.c b/src/syldap.c
index 21afde7686583d5a745cfc468a3a1762eb54a3e4..1ff069a85699701c3385d903d32392ae71bef2b4 100644 (file)
--- a/src/syldap.c
+++ b/src/syldap.c
@@ -314,6 +314,7 @@ void syldap_print_short( SyldapServer *ldapServer, FILE *stream ) {
        fprintf( stream, "  ret val: %d\n",   ldapServer->retVal );
 }
 
        fprintf( stream, "  ret val: %d\n",   ldapServer->retVal );
 }
 

+#if 0

 /*
 * Build an address list entry and append to list of address items. Name is formatted
 * as it appears in the common name (cn) attribute.
 /*
 * Build an address list entry and append to list of address items. Name is formatted
 * as it appears in the common name (cn) attribute.


@@ -341,6 +342,7 @@ static void syldap_build_items_cn( SyldapServer *ldapServer, GSList *listName, G
                nodeName = g_slist_next( nodeName );
        }
 }
                nodeName = g_slist_next( nodeName );
        }
 }

+#endif

 
 /*
 * Build an address list entry and append to list of address items. Name is formatted
 
 /*
 * Build an address list entry and append to list of address items. Name is formatted