From 5c402eee6894e189bc5c5bf6b38f97613f28a4d5 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 16 Dec 2004 09:15:10 +0000 Subject: [PATCH] 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 --- ChangeLog | 28 ++++++++++++++++++++++++++++ ChangeLog.claws | 10 ++++++++++ ChangeLog.jp | 23 +++++++++++++++++++++++ NEWS | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 2 +- src/syldap.c | 2 ++ 8 files changed, 75 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b195e6fa2..9ee05623b 100644 --- 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 diff --git a/ChangeLog.claws b/ChangeLog.claws index 26fb1cc7a..813166807 100644 --- 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 diff --git a/ChangeLog.jp b/ChangeLog.jp index 387ac2175..db0e11244 100644 --- 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(): ¼¡¤Î¹Ô¤ÎºÇ½é¤Îʸ»ú¤¬ diff --git a/NEWS b/NEWS index 363451add..1e8f243cc 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,14 @@ 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. diff --git a/PATCHSETS b/PATCHSETS index 8bc0e16d5..45da54070 100644 --- 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.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 acda20696..c9fcc6993 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 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 diff --git a/src/compose.c b/src/compose.c index f16640294..fd1eacafd 100644 --- 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); - if (clen_prev != clen || + if ((clen_prev != clen && clen > 1) || (clen == 1 && !isspace((guchar)cb[0]))) { gtk_stext_insert diff --git a/src/syldap.c b/src/syldap.c index 21afde768..1ff069a85 100644 --- 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 ); } +#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. @@ -341,6 +342,7 @@ static void syldap_build_items_cn( SyldapServer *ldapServer, GSList *listName, G nodeName = g_slist_next( nodeName ); } } +#endif /* * Build an address list entry and append to list of address items. Name is formatted -- 2.25.1