2004-12-18 [paul] 0.9.13cvs21.1
authorPaul Mangan <paul@claws-mail.org>
Sat, 18 Dec 2004 07:39:50 +0000 (07:39 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 18 Dec 2004 07:39:50 +0000 (07:39 +0000)
* AUTHORS
* ChangeLog
* ChangeLog.claws
* ChangeLog.jp
* NEWS
* configure.ac
* src/action.c
* src/compose.c
* src/syldap.c
sync with HEAD

AUTHORS
ChangeLog
ChangeLog-gtk2.claws
ChangeLog.claws
ChangeLog.jp
NEWS
PATCHSETS
configure.ac
src/action.c
src/compose.c
src/syldap.c

diff --git a/AUTHORS b/AUTHORS
index fb8f9c8..66093b4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -147,7 +147,7 @@ contributors (beside the above; based on Changelog)
        Tobias Sandhaas
        Thomas Link
        Martin Pool
-       Fredrik Olofsson
+       Fredrik Olofssen
        Gustavo Noronha Silva
        Simon 'corecode' Schubert
        Dale P. Smith
@@ -211,5 +211,6 @@ contributors (beside the above; based on Changelog)
        Stephan Sachse
        Thomas Gilgin
        Guy Rouillier
-       Jen-Yves Lefort
+       Jean-Yves Lefort
        George Michaelson
+       IWAMOTO Kouichi
index b195e6f..978a809 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2004-12-17
+
+       * src/action.c: parse_append_filename(): escape all special characters
+         without quote (thanks to IWAMOTO Kouichi and Yoichi Imai).
+       * AUTHORS: updated.
+
+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
index 2839916..ee7612b 100644 (file)
@@ -1,3 +1,16 @@
+2004-12-18 [paul]      0.9.13cvs21.1
+
+       * AUTHORS
+       * ChangeLog
+       * ChangeLog.claws
+       * ChangeLog.jp
+       * NEWS
+       * configure.ac
+       * src/action.c
+       * src/compose.c
+       * src/syldap.c
+               sync with HEAD
+
 2004-12-17 [martin]    0.9.13cvs17.2
 
        * src/action.c
index 5670679..02884a5 100644 (file)
@@ -1,3 +1,31 @@
+2004-12-18 [paul]      0.9.13cvs21
+
+       * AUTHORS
+       * ChangeLog
+       * ChangeLog.jp
+       * src/action.c
+               sync with main, see ChangeLog 2004-12-17
+
+2004-12-17 [thorsten]  0.9.13cvs20
+
+       * src/compose.c
+               protect trailing spaces when signing message
+
+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
+               Fix build. Sorry :)
+
 2004-12-14 [colin]     0.9.13cvs17
 
        * src/gtk/gtkutils.c
index 387ac21..19fb827 100644 (file)
@@ -1,3 +1,38 @@
+2004-12-17
+
+       * src/action.c: parse_append_filename(): Á´¤Æ¤ÎÆüìʸ»ú¤ò°úÍÑÉä¤Ê¤·¤Ë
+         ¥¨¥¹¥±¡¼¥×¤¹¤ë¤è¤¦¤Ë¤·¤¿(IWAMOTO Kouichi ¤µ¤ó¤È Yoichi Imai ¤µ¤ó
+         thanks)¡£
+       * AUTHORS: ¹¹¿·¡£
+
+2004-12-16
+
+       * INSTALL
+         INSTALL.jp: Æ°ºî³Îǧ¥ê¥¹¥È¤ò¹¹¿·¡£
+
+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 363451a..1e8f243 100644 (file)
--- 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.
index d1370de..97196c4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.22.2.5 -r 1.22.2.6 src/quote_fmt_parse.y; ) > 0.9.13cvs14.1.patchset
 ( cvs diff -u -r 1.396.2.15 -r 1.396.2.16 ChangeLog; cvs diff -u -r 1.391.2.15 -r 1.391.2.16 ChangeLog.jp; cvs diff -u -r 1.2504.2.38 -r 1.2504.2.39 ChangeLog.claws; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/action.c; cvs diff -u -r 1.36.2.17 -r 1.36.2.18 src/common/utils.c; cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/gtk/prefswindow.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/gtk/gtkutils.h; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/plugins/spamassassin/libspamc.c; ) > 0.9.13cvs17.1.patchset
 ( cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/action.c; cvs diff -u -r 1.149.2.17 -r 1.149.2.18 src/inc.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/select-keys.c; ) > 0.9.13cvs17.2.patchset
+( cvs diff -u -r 1.100.2.8 -r 1.100.2.9 AUTHORS; cvs diff -u -r 1.396.2.16 -r 1.396.2.17 ChangeLog; cvs diff -u -r 1.2504.2.39 -r 1.2504.2.40 ChangeLog.claws; cvs diff -u -r 1.391.2.16 -r 1.391.2.17 ChangeLog.jp; cvs diff -u -r 1.42.2.6 -r 1.42.2.7 NEWS; cvs diff -u -r 1.654.2.324 -r 1.654.2.325 configure.ac; cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/action.c; cvs diff -u -r 1.382.2.80 -r 1.382.2.81 src/compose.c; cvs diff -u -r 1.16 -r 1.17 src/syldap.c; ) > 0.9.13cvs21.1.patchset
index 905a812..0d63d79 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=21
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index ee76faf..436ca40 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto & The Sylpheed Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -335,35 +335,31 @@ static gchar *parse_action_cmd(gchar *action, MsgInfo *msginfo,
 static gboolean parse_append_filename(GString *cmd, MsgInfo *msginfo)
 {
        gchar *filename;
-       gchar *p;
+       gchar *p, *q;
+       gchar escape_ch[] = "\\ ";
 
        g_return_val_if_fail(msginfo, FALSE);
 
        filename = procmsg_get_message_file(msginfo);
 
-       if (filename) {
-               g_string_append_c(cmd, '"');
-               for (p = filename; *p != '\0'; p++) {
-                       switch (*p) {
-                       case '$':
-                       case '"':
-                       case '`':
-                       case '\\':
-                               g_string_append_c(cmd, '\\');
-                               break;
-                       default:
-                               break;
-                       }
-                       g_string_append_c(cmd, *p);
-               }
-               g_string_append_c(cmd, '"');
-               g_free(filename);
-       } else {
+       if (!filename) {
                alertpanel_error(_("Could not get message file %d"),
                                 msginfo->msgnum);
                return FALSE;
        }
 
+       p = filename;
+       while ((q = strpbrk(p, "$\"`'\\ \t*?[]&|;<>()!#~")) != NULL) {
+               escape_ch[1] = *q;
+               *q = '\0';
+               g_string_append(cmd, p);
+               g_string_append(cmd, escape_ch);
+               p = q + 1;
+       }
+       g_string_append(cmd, p);
+
+       g_free(filename);
+
        return TRUE;
 }
 
index f12e01b..99282bd 100644 (file)
@@ -3641,6 +3641,10 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        mimetext->subtype = g_strdup("plain");
        g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
                            g_strdup(out_codeset));
+       /* protect trailing spaces when signing message */
+       if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
+           privacy_system_can_sign(compose->privacy_system))
+               encoding = ENC_QUOTED_PRINTABLE;
        if (encoding != ENC_UNKNOWN)
                procmime_encode_content(mimetext, encoding);
 
index 21afde7..1ff069a 100644 (file)
@@ -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