2004-12-02 [paul] 0.9.12cvs180
authorPaul Mangan <paul@claws-mail.org>
Thu, 2 Dec 2004 18:14:45 +0000 (18:14 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 2 Dec 2004 18:14:45 +0000 (18:14 +0000)
* ChangeLog
* ChangeLog.jp
* src/Makefile.am
* src/pop.c
* src/common/utils.c
* src/common/utils.h
* src/pixmaps/folder.xpm **REMOVED**
sync with main
fixes bug 644 'extra CRs in subject line break filtering'

ChangeLog
ChangeLog.claws
ChangeLog.jp
PATCHSETS
configure.ac
src/Makefile.am
src/common/utils.c
src/common/utils.h
src/pixmaps/folder.xpm [deleted file]
src/pop.c

index aec4e3b..187f3c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2004-12-02
+
+       * src/pop.c: pop3_write_msg_to_file(): don't convert single CRs to
+         LFs (thanks to Alfons).
+       * src/utils.[ch]: my_memmem(): original implementation of memmem().
+
+2004-12-01
+
+       * manual/ja/sylpheed.sgml: updated for the latest version.
+
+2004-12-01
+
+       * src/pixmaps/unread.xpm: adjusted the hue of image.
+
+2004-12-01
+
+       * src/filter.c: removed C99 '//' comments.
+
+2004-11-30
+
+       * src/pixmaps/dir-close.xpm
+         src/pixmaps/dir-open.xpm
+         src/pixmaps/dir-noselect.xpm
+         src/pixmaps/group.xpm: adjusted the hue of images.
+
+2004-11-29
+
+       * src/pixmaps/dir-close.xpm
+         src/pixmaps/dir-open.xpm
+         src/pixmaps/dir-noselect.xpm
+         src/pixmaps/group.xpm: replaced with new images.
+
+2004-11-29
+
+       * src/pixmaps/folder.xpm: removed.
+
+2004-11-26
+
+       * src/summaryview.c: changed one-letter column titles to icons.
+       * src/pixmaps/mail.xpm: new.
+
+2004-11-26
+
+       * src/summaryview.c: summary_execute(): pop summary statusbar message.
+
+2004-11-26
+
+       * src/prefs_common.c: added Web browser commands.
+
+2004-11-26
+
+       * manual/ja/sylpheed.sgml: updated for the latest version.
+       * manual/ja/Makefile.am: added target 'update-html'.
+
+2004-11-22
+
+       * INSTALL
+         INSTALL.jp: updated the confirmation list.
+
+2004-11-19
+
+       * src/jpilot.c: unify the coding style.
+       * src/mainwindow.c: fixed duplicated accelerator.
+
+2004-11-18
+
+       * src/procmsg.c: write_mark_func(): fixed bad cast on the system that
+         sizeof(gpointer) != guint.
+
+2004-11-18
+
+       * src/mainwindow.c: fixed English (trashes -> trash).
+       * src/prefs_common.c: prefs_keybind_apply_clicked(): updated menu
+         strings.
+
+2004-11-18
+
+       * src/mainwindow.c: changed the menu label "Empty trash" to
+         "Empty all trashes".
+
 2004-11-16
 
        * version 1.0.0beta3
index 058085b..bb5ded0 100644 (file)
@@ -1,3 +1,15 @@
+2004-12-02 [paul]      0.9.12cvs180
+
+       * ChangeLog
+       * ChangeLog.jp
+       * src/Makefile.am
+       * src/pop.c
+       * src/common/utils.c
+       * src/common/utils.h
+       * src/pixmaps/folder.xpm **REMOVED**
+               sync with main
+               fixes bug 644 'extra CRs in subject line break filtering' 
+
 2004-12-02 [colin]     0.9.12cvs179
 
        * src/compose.c
index c8e1842..d252816 100644 (file)
@@ -1,3 +1,84 @@
+2004-12-02
+
+       * src/pop.c: pop3_write_msg_to_file(): Ã±ÂΤΠCR ¤ò LF ¤ËÊÑ´¹¤·¤Ê¤¤
+         ¤è¤¦¤Ë¤·¤¿(Alfons ¤µ¤ó thanks)¡£
+       * src/utils.[ch]: my_memmem(): my_memmem() ¤òÆȼ«¼ÂÁõ¡£
+
+2004-12-01
+
+       * manual/ja/sylpheed.sgml: ºÇ¿·ÈǤËÄɽ¾¡£
+
+2004-12-01
+
+       * src/pixmaps/unread.xpm: ¿§¹ç¤¤¤òÄ´À°¡£
+
+2004-12-01
+
+       * src/filter.c: C99 '//' ¥³¥á¥ó¥È¤òºï½ü¡£
+
+2004-11-30
+
+       * src/pixmaps/dir-close.cpm
+         src/pixmaps/dir-open.xpm
+         src/pixmaps/dir-noselect.xpm
+         src/pixmaps/group.xpm: ¿§¹ç¤¤¤òÄ´À°¡£
+
+2004-11-29
+
+       * src/pixmaps/dir-close.cpm
+         src/pixmaps/dir-open.xpm
+         src/pixmaps/dir-noselect.xpm
+         src/pixmaps/group.xpm: ¿·¤·¤¤²èÁü¤ÇÃÖ¤­´¹¤¨¤¿¡£
+
+2004-11-29
+
+       * src/pixmaps/folder.xpm: ºï½ü¡£
+
+2004-11-26
+
+       * src/summaryview.c: 1ʸ»ú¤Î¥«¥é¥à¥¿¥¤¥È¥ë¤ò¥¢¥¤¥³¥ó¤ËÊѹ¹¡£
+       * src/pixmaps/mail.xpm: ¿·µ¬¡£
+
+2004-11-26
+
+       * src/summaryview.c: summary_execute(): ¥µ¥Þ¥ê¤Î¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼
+         ¥á¥Ã¥»¡¼¥¸¤ò pop ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-11-26
+
+       * src/prefs_common.c: Web ¥Ö¥é¥¦¥¶¥³¥Þ¥ó¥É¤òÄɲá£
+
+2004-11-26
+
+       * manual/ja/sylpheed.sgml: ºÇ¿·ÈǤËÄɽ¾¡£
+       * manual/ja/Makefile.am: ¥¿¡¼¥²¥Ã¥È 'update-html' ¤òÄɲá£
+
+2004-11-22
+
+       * INSTALL
+         INSTALL.jp: Æ°ºî³Îǧ¥ê¥¹¥È¤ò¹¹¿·¡£
+
+2004-11-19
+
+       * src/jpilot.c: ¥³¡¼¥Ç¥£¥ó¥°¥¹¥¿¥¤¥ë¤òÅý°ì¡£
+       * src/mainwindow.c: ½ÅÊ£¤¹¤ë¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò½¤Àµ¡£
+
+2004-11-18
+
+       * src/procmsg.c: write_mark_func(): sizeof(gpointer) != guint ¤È¤Ê¤ë
+         ¥·¥¹¥Æ¥à¤Ç¤Î¸í¤Ã¤¿¥­¥ã¥¹¥È¤ò½¤Àµ¡£
+
+2004-11-18
+
+       * src/mainwindow.c: ±Ñ¸ì¤ò½¤Àµ(trashes -> trash)¡£
+       * src/prefs_common.c: prefs_keybind_apply_clicked(): ¥á¥Ë¥å¡¼Ê¸»úÎó
+         ¤ò¹¹¿·¡£
+
+2004-11-18
+
+       * src/mainwindow.c: ¥á¥Ë¥å¡¼¥é¥Ù¥ë¡Ö¤´¤ßÈ¢¤ò¶õ¤Ë¤¹¤ë¡×¤ò¡Ö¤¹¤Ù¤Æ¤Î
+         ¤´¤ßÈ¢¤ò¶õ¤Ë¤¹¤ë¡×¤ËÊѹ¹¡£
+
 2004-11-16
 
        * version 1.0.0beta3
index eb620bd..e0f1ea0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.16 -r 1.17 src/gtk/prefswindow.c; cvs diff -u -r 1.8 -r 1.9 src/gtk/pluginwindow.c; ) > 0.9.12cvs177.patchset
 ( cvs diff -u -r 1.458 -r 1.459 src/compose.c; ) > 0.9.12cvs178.patchset
 ( cvs diff -u -r 1.459 -r 1.460 src/compose.c; ) > 0.9.12cvs179.patchset
+( cvs diff -u -r 1.447 -r 1.448 ChangeLog; cvs diff -u -r 1.442 -r 1.443 ChangeLog.jp; cvs diff -u -r 1.189 -r 1.190 src/Makefile.am; cvs diff -u -r 1.71 -r 1.72 src/pop.c; cvs diff -u -r 1.59 -r 1.60 src/common/utils.c; cvs diff -u -r 1.35 -r 1.36 src/common/utils.h; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/folder.xpm; ) > 0.9.12cvs180.patchset
index 5dc1ee1..6f22fad 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=179
+EXTRA_VERSION=180
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 35d2628..7131ae4 100644 (file)
@@ -277,7 +277,6 @@ EXTRA_DIST = \
        pixmaps/drafts_open.xpm \
        pixmaps/error.xpm \
        pixmaps/exec.xpm \
-       pixmaps/folder.xpm \
        pixmaps/forwarded.xpm \
        pixmaps/gpg_signed.xpm \
        pixmaps/group.xpm \
index 03ed617..159ffac 100644 (file)
@@ -308,6 +308,29 @@ gchar *strcasestr(const gchar *haystack, const gchar *needle)
        return NULL;
 }
 
+gpointer my_memmem(gconstpointer haystack, size_t haystacklen,
+                  gconstpointer needle, size_t needlelen)
+{
+       const gchar *haystack_ = (const gchar *)haystack;
+       const gchar *needle_ = (const gchar *)needle;
+       const gchar *haystack_cur = (const gchar *)haystack;
+
+       if (needlelen == 1)
+               return memchr(haystack_, *needle_, haystacklen);
+
+       while ((haystack_cur = memchr(haystack_cur, *needle_, haystacklen))
+              != NULL) {
+               if (haystacklen - (haystack_cur - haystack_) < needlelen)
+                       break;
+               if (memcmp(haystack_cur + 1, needle_ + 1, needlelen - 1) == 0)
+                       return (gpointer)haystack_cur;
+               else
+                       haystack_cur++;
+       }
+
+       return NULL;
+}
+
 /* Copy no more than N characters of SRC to DEST, with NULL terminating.  */
 gchar *strncpy2(gchar *dest, const gchar *src, size_t n)
 {
index 623fdc6..c0969b2 100644 (file)
@@ -207,6 +207,10 @@ gchar *strtailchomp        (gchar          *str,
 gchar *strcrchomp      (gchar          *str);
 gchar *strcasestr      (const gchar    *haystack,
                         const gchar    *needle);
+gpointer my_memmem     (gconstpointer   haystack,
+                        size_t          haystacklen,
+                        gconstpointer   needle,
+                        size_t          needlelen);
 gchar *strncpy2                (gchar          *dest,
                         const gchar    *src,
                         size_t          n);
diff --git a/src/pixmaps/folder.xpm b/src/pixmaps/folder.xpm
deleted file mode 100644 (file)
index 962e47d..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-"16 16 61 1",
-"      c None",
-".     c #42423F",
-"+     c #74746A",
-"@     c #949484",
-"#     c #4C4C44",
-"$     c #AAAA98",
-"%     c #E3E3CC",
-"&     c #818175",
-"*     c #88887E",
-"=     c #BABAAA",
-"-     c #DFDFCC",
-";     c #B9B9AA",
-">     c #88887A",
-",     c #727166",
-"'     c #5F5D55",
-")     c #67655C",
-"!     c #4F4D46",
-"~     c #5F5F55",
-"{     c #DDDDC7",
-"]     c #D1D1BD",
-"^     c #ADAD9F",
-"/     c #88877E",
-"(     c #73726B",
-"_     c #6E6C64",
-":     c #838175",
-"<     c #9B988A",
-"[     c #5D5B52",
-"}     c #9C9C8F",
-"|     c #FCFCF9",
-"1     c #7F7F7A",
-"2     c #626057",
-"3     c #717165",
-"4     c #D8D8D2",
-"5     c #82817C",
-"6     c #3F3F38",
-"7     c #C1C1B6",
-"8     c #807F7A",
-"9     c #57554D",
-"0     c #9D9D92",
-"a     c #797873",
-"b     c #999688",
-"c     c #979486",
-"d     c #868376",
-"e     c #363530",
-"f     c #68685D",
-"g     c #605F5B",
-"h     c #8E8B7E",
-"i     c #939083",
-"j     c #8C897C",
-"k     c #6D6A60",
-"l     c #42413B",
-"m     c #0A0908",
-"n     c #000000",
-"o     c #585850",
-"p     c #7C796E",
-"q     c #7B796D",
-"r     c #403F39",
-"s     c #171614",
-"t     c #272623",
-"u     c #45433D",
-"v     c #161513",
-"                ",
-"                ",
-"                ",
-"        .+@     ",
-" #$%&*=-;>,')!  ",
-" ~{]^/(_:<<<<[  ",
-"  }|1<<<<<<<<2  ",
-"  345<<<<<<<<[  ",
-"  678<<<<<<<<9  ",
-"   0ab<<<<<cde  ",
-"   fgh<<ijklmnn ",
-"    opq)rsnnnn  ",
-"   ntuvnnnn     ",
-"     nnn        ",
-"                ",
-"                "};
index 4636cfc..b58adf5 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -674,7 +674,8 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
         * ^data              ^prev            ^cur             data+len-1^ */
 
        prev = data;
-       while ((cur = memchr(prev, '\r', len - (prev - data))) != NULL) {
+       while ((cur = (gchar *)my_memmem(prev, len - (prev - data), "\r\n", 2))
+              != NULL) {
                if ((cur > prev && fwrite(prev, cur - prev, 1, fp) < 1) ||
                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR(file, "fwrite");