2004-12-03 [paul] 0.9.12cvs180.1
authorPaul Mangan <paul@claws-mail.org>
Fri, 3 Dec 2004 04:30:51 +0000 (04:30 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 3 Dec 2004 04:30:51 +0000 (04:30 +0000)
* ChangeLog
* ChangeLog.claws
* ChangeLog.jp
* configure.ac
* src/Makefile.am
* src/pop.c
* src/common/utils.c
* src/common/utils.h
* src/pixmaps/continue.xpm
* src/pixmaps/dir_close.xpm
* src/pixmaps/dir_open.xpm
* src/pixmaps/drafts_close.xpm
* src/pixmaps/drafts_open.xpm
* src/pixmaps/folder.xpm **REMOVED**
* src/pixmaps/group.xpm
* src/pixmaps/unread.xpm
sync with HEAD

18 files changed:
ChangeLog
ChangeLog-gtk2.claws
ChangeLog.claws
ChangeLog.jp
PATCHSETS
configure.ac
src/Makefile.am
src/common/utils.c
src/common/utils.h
src/pixmaps/continue.xpm
src/pixmaps/dir_close.xpm
src/pixmaps/dir_open.xpm
src/pixmaps/drafts_close.xpm
src/pixmaps/drafts_open.xpm
src/pixmaps/folder.xpm [deleted file]
src/pixmaps/group.xpm
src/pixmaps/unread.xpm
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 1bf6f13..7cd1eef 100644 (file)
@@ -1,3 +1,23 @@
+2004-12-03 [paul]      0.9.12cvs180.1
+
+       * ChangeLog
+       * ChangeLog.claws
+       * ChangeLog.jp
+       * configure.ac
+       * src/Makefile.am
+       * src/pop.c
+       * src/common/utils.c
+       * src/common/utils.h
+       * src/pixmaps/continue.xpm
+       * src/pixmaps/dir_close.xpm
+       * src/pixmaps/dir_open.xpm
+       * src/pixmaps/drafts_close.xpm
+       * src/pixmaps/drafts_open.xpm
+       * src/pixmaps/folder.xpm **REMOVED**
+       * src/pixmaps/group.xpm
+       * src/pixmaps/unread.xpm
+               sync with HEAD
+
 2004-12-02 [colin]     0.9.12cvs179.1
 
        * src/compose.c
index 421629b..a0472f2 100644 (file)
@@ -1,3 +1,147 @@
+2004-12-03 [paul]
+
+       * src/pixmaps/dir_close.xpm
+       * src/pixmaps/dir_open.xpm
+       * src/pixmaps/drafts_close.xpm
+       * src/pixmaps/drafts_open.xpm
+       * src/pixmaps/group.xpm
+       * src/pixmaps/unread.xpm
+               update icons (sync with main (adjust hue))      
+
+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
+               Prevent duplicate edition of queued
+               and drafted mails
+
+2004-12-02 [colin]     0.9.12cvs178
+
+       * src/compose.c
+               Fix quote linewrapping ignoring pref
+               Patch by Alfons
+
+2004-11-30 [colin]     0.9.12cvs177
+
+       * src/gtk/prefswindow.c
+       * src/gtk/pluginwindow.c
+               Add shortcut keys to prefs window
+               and plugin window. Patch by Fabien Vantard.
+
+2004-11-29 [colin]     0.9.12cvs176
+
+       * src/folderview.c
+               Fix disappearing separators in folderview's popup
+
+2004-11-29 [colin]     0.9.12cvs175
+
+       * src/procmime.c
+               Another format bug
+
+2004-11-29 [colin]     0.9.12cvs174
+
+       * src/pop.c
+               Fix format string
+
+2004-11-26 [colin]     0.9.12cvs173
+
+       * src/common/smtp.c
+       * src/common/smtp.h
+               Use ESMTP for all servers advertising it
+               Add SIZE= parameter to MAIL command for 
+               ESMTP servers
+
+2004-11-24 [colin]     0.9.12cvs172
+
+       * src/plugins/pgpmime/pgpmime.c
+               Forgot one :(
+
+2004-11-24 [colin]     0.9.12cvs171
+
+       * src/plugins/pgpmime/pgpmime.c
+               Fix numerous GpgmeGtk leaks
+
+2004-11-24 [colin]     0.9.12cvs170
+
+       * src/plugins/pgpmime/pgpmime.c
+               Fix numerous GpgmeCtx leaks
+
+2004-11-24 [colin]     0.9.12cvs169
+
+       * src/plugins/pgpmime/plugin.c
+               Update requirements
+       * src/plugins/trayicon/Makefile.am
+       * src/plugins/trayicon/newmarkedmail.xpm
+       * src/plugins/trayicon/trayicon.c
+       * src/plugins/trayicon/unreadmarkedmail.xpm
+               Add new icons when there are unread marked mails
+               answers
+
+2004-11-23 [thorsten]  0.9.12cvs168
+
+       * src/plugins/pgpmime/plugin.c
+               typo: plugin_init instead of plugin_done
+
+2004-11-23 [thorsten]  0.9.12cvs167
+
+       * commitHelper
+               o add me
+       * src/partial_download.c
+       * src/partial_download.h
+               o fix path for includes
+
+2004-11-23 [colin]     0.9.12cvs166
+
+       * src/procmime.c
+               Uh, changed API.
+
+2004-11-23 [colin]     0.9.12cvs165
+
+       * src/procmime.c
+               Fix mime headers wrapping
+
+2004-11-23 [christoph] 0.9.12cvs164
+
+       * src/common/Makefile.am
+       * src/common/partial_download.[ch]
+       * src/Makefile.am
+       * src/partial_download.[ch]
+       * src/folderview.c
+               move to src because it depends on src stuff
+
+       * src/codeconv.c
+       * src/common/base64.h
+               move B64LEN macro to base64.h
+
+       * src/compose.c
+       * src/privacy.[ch]
+               add PrefsAccount to sign-function parameters
+
+       * src/main.c
+       * src/prefs_account.[ch]
+       * src/gtk/prefswindow.[ch]
+               o use new prefswindow for account prefs
+               o add possibility to add new pages to account prefs
+
+       * src/plugins/pgpmime/prefs_gpg.[ch]
+       * src/plugins/pgpmime/prefs_gpg.glade
+               add account prefs for GPG
+
+       * src/plugins/pgpmime/pgpmime.c
+       * src/plugins/pgpmime/sgpgme.[ch]
+               create signers list based on the GPG account prefs
+
 2004-11-23 [colin]     0.9.12cvs163
 
        * src/main.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 e2babcf..4a2c31d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.6.10.2 -r 1.6.10.3 src/addrharvest.c; ) > 0.9.12cvs177.3.patchset
 ( cvs diff -u -r 1.382.2.75 -r 1.382.2.76 src/compose.c; ) > 0.9.12cvs178.1.patchset
 ( cvs diff -u -r 1.382.2.76 -r 1.382.2.77 src/compose.c; ) > 0.9.12cvs179.1.patchset
+( cvs diff -u -r 1.396.2.13 -r 1.396.2.14 ChangeLog; cvs diff -u -r 1.2504.2.34 -r 1.2504.2.35 ChangeLog.claws; cvs diff -u -r 1.391.2.13 -r 1.391.2.14 ChangeLog.jp; cvs diff -u -r 1.654.2.305 -r 1.654.2.306 configure.ac; cvs diff -u -r 1.155.2.14 -r 1.155.2.15 src/Makefile.am; cvs diff -u -r 1.56.2.29 -r 1.56.2.30 src/pop.c; cvs diff -u -r 1.36.2.16 -r 1.36.2.17 src/common/utils.c; cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/common/utils.h; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/continue.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/dir_close.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/dir_open.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/drafts_close.xpm; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/drafts_open.xpm; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/folder.xpm; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/pixmaps/group.xpm; cvs diff -u -r 1.2 -r 1.3 src/pixmaps/unread.xpm; ) > 0.9.12cvs180.1.patchset
index 0ddb09e..b8eeb77 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=
 EXTRA_GTK2_VERSION=.1
 
index 48823a4..7109c02 100644 (file)
@@ -279,7 +279,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 f169499..2d604e4 100644 (file)
@@ -309,6 +309,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)
 {
@@ -3556,8 +3579,6 @@ gchar *generate_msgid(gchar *buf, gint len)
                   lt->tm_min, lt->tm_sec,
                   (guint) rand(), addr);
 
-       debug_print("generated Message-ID: %s\n", buf);
-
        g_free(addr);
        return buf;
 }
index 96bdadc..c854ab4 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);
index 9237651..99b3c7f 100644 (file)
@@ -1,76 +1,42 @@
 /* XPM */
 static char * continue_xpm[] = {
-"24 24 49 1",
+"10 10 29 1",
 "      c None",
 ".     c #000000",
-"+     c #E1EADF",
-"@     c #FFFFFF",
-"#     c #F0F4EF",
-"$     c #D4E0D1",
-"%     c #F3F7F3",
-"&     c #EDF2EB",
-"*     c #CEDCCB",
+"+     c #B1C7AC",
+"@     c #F6F9F6",
+"#     c #E1EADF",
+"$     c #F7F9F6",
+"%     c #F0F4EF",
+"&     c #ECF2EB",
+"*     c #E5EDE4",
 "=     c #F4F7F4",
-"-     c #F1F5F0",
-";     c #EFF3EE",
-">     c #EBF1EA",
-",     c #C9D8C5",
-"'     c #E5ECE3",
-")     c #CBDAC7",
-"!     c #181818",
-"~     c #2B2B2B",
-"{     c #E4EBE2",
-"]     c #DEE7DC",
-"^     c #D7E3D5",
-"/     c #EEF3ED",
-"(     c #B1C7AC",
-"_     c #9DBB90",
-":     c #88AC80",
-"<     c #83AA7C",
-"[     c #85A879",
-"}     c #7EA476",
-"|     c #84A778",
-"1     c #759B6C",
-"2     c #59814F",
-"3     c #3A5934",
-"4     c #9ABB8F",
-"5     c #83AA7A",
-"6     c #87AC7D",
-"7     c #82A87B",
-"8     c #86A97C",
-"9     c #759C6D",
-"0     c #537C49",
-"a     c #445840",
-"b     c #80A776",
-"c     c #749868",
-"d     c #4B7040",
-"e     c #90B387",
-"f     c #749A6B",
-"g     c #3B5E31",
-"h     c #5D8554",
-"i     c #37592F",
-"j     c #3F6534",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"      ..                ",
-"      .+..              ",
-"      .@#$..            ",
-"      .@%&#*..          ",
-"      .@=-;>-,..        ",
-"      .@;;;>>'#)!.      ",
-"      ~@;;;>{]^]/(..    ",
-"      ._:<:<[}|123..    ",
-"      .4567|890a..      ",
-"      .46b[c0d..        ",
-"      .ebf0g..          ",
-"      .<hi..            ",
-"      .j..              ",
-"      ..                ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
+"-     c #EFF3EE",
+";     c #E4ECE3",
+">     c #E0E9DE",
+",     c #8EB184",
+"'     c #85AB7D",
+")     c #84AA7C",
+"!     c #82A678",
+"~     c #769C6C",
+"{     c #577550",
+"]     c #2E4429",
+"^     c #8CB182",
+"/     c #83A879",
+"(     c #7DA171",
+"_     c #608756",
+":     c #30462B",
+"<     c #7CA273",
+"[     c #52744A",
+"}     c #2D4526",
+"|     c #31472C",
+"..        ",
+".+..      ",
+".@#+..    ",
+".$%&*+..  ",
+".=-&;>#+..",
+".,')!~{]..",
+".^/(_:..  ",
+".<[}..    ",
+".|..      ",
+"..        "};
index 6edf902..bd3d602 100644 (file)
 /* XPM */
 static char * dir_close_xpm[] = {
-"16 16 28 1",
+"16 16 86 1",
 "      c None",
 ".     c #000000",
-"+     c #A1ACDA",
-"@     c #7C83C1",
-"#     c #808CC7",
-"$     c #656AAB",
-"%     c #E5E9FD",
-"&     c #D4D7F6",
-"*     c #E9EBFD",
-"=     c #B1B6ED",
-"-     c #C6C9F8",
-";     c #CBD3F3",
-">     c #ACB4E5",
-",     c #C0C9E7",
-"'     c #A4ABDC",
-")     c #9BA5D9",
-"!     c #878DCE",
-"~     c #656AAD",
-"{     c #DDE1FA",
-"]     c #5C5D99",
-"^     c #545588",
-"/     c #8C97D0",
-"(     c #747CBF",
-"_     c #9AA1D7",
-":     c #7377BC",
-"<     c #4C4E77",
-"[     c #C6CFEE",
-"}     c #3C3E65",
+"+     c #4E8EE5",
+"@     c #6EACF4",
+"#     c #4885E3",
+"$     c #66A6EF",
+"%     c #63A2F1",
+"&     c #7AB5F6",
+"*     c #6FAAF5",
+"=     c #65A2F0",
+"-     c #4D8BE9",
+";     c #DDF1FE",
+">     c #D7EDFE",
+",     c #D5ECFE",
+"'     c #D3EBFE",
+")     c #CDE6FD",
+"!     c #B9DBFD",
+"~     c #B4D8FC",
+"{     c #AAD3FC",
+"]     c #94C4FA",
+"^     c #D0EAFE",
+"/     c #C0E2FD",
+"(     c #BADFFC",
+"_     c #B9DEFC",
+":     c #B5DBFC",
+"<     c #A9D2FB",
+"[     c #98C9FA",
+"}     c #90C2FA",
+"|     c #80B9F8",
+"1     c #639EF1",
+"2     c #CDE8FD",
+"3     c #ABD7FB",
+"4     c #A9D6FB",
+"5     c #A8D5FB",
+"6     c #A4D2FB",
+"7     c #9BCAFA",
+"8     c #8EC0F9",
+"9     c #83BBF9",
+"0     c #7CB4F8",
+"a     c #66A0F2",
+"b     c #4680E5",
+"c     c #CBE7FD",
+"d     c #B7DDFC",
+"e     c #A5D2FB",
+"f     c #A2D1FB",
+"g     c #96C8FA",
+"h     c #8ABFF9",
+"i     c #7DB5F8",
+"j     c #71ACF6",
+"k     c #5895EE",
+"l     c #386FDE",
+"m     c #CBE8FD",
+"n     c #A8D3FB",
+"o     c #74AEF7",
+"p     c #65A1F4",
+"q     c #4D88EA",
+"r     c #3468D5",
+"s     c #B1D8FB",
+"t     c #9FCFFA",
+"u     c #93C6F9",
+"v     c #87BEF9",
+"w     c #7FB9F8",
+"x     c #7AB3F8",
+"y     c #5691F0",
+"z     c #427EE5",
+"A     c #2F61CC",
+"B     c #C0E1FD",
+"C     c #9BC9F9",
+"D     c #80B8F6",
+"E     c #74AEF6",
+"F     c #6BA5F4",
+"G     c #639FF3",
+"H     c #5A94F0",
+"I     c #417CE4",
+"J     c #3469D8",
+"K     c #2957BE",
+"L     c #AAD4FB",
+"M     c #70AAF3",
+"N     c #538EEC",
+"O     c #4F89EA",
+"P     c #4F8AEC",
+"Q     c #4B87EA",
+"R     c #4683E8",
+"S     c #4076E1",
+"T     c #356AD8",
+"U     c #254EAB",
 "                ",
 "                ",
 "    ....        ",
-"   .+@+@.       ",
-"  .#$#$#$...... ",
-"  .%&*&*&%*=-;>.",
-"  .;+,+,+,')!+~.",
-"  .{,+,+,))!+!].",
-"  .;+,+,)+!+!!^.",
-"  .{,+,)+!+!/(^.",
-"  .;+,_+!+!!(:<.",
-"  .{,_+!+!!::~<.",
-"  .[]~]:]~]^<<}.",
+"   .+@@#.       ",
+"  .$%&*=-...... ",
+"  .;>,',',)!~{].",
+"  .^/(_(_:<[}|1.",
+"  .2_34567890ab.",
+"  .cd4efgh9ijkl.",
+"  .mdnfgh9iopqr.",
+"  .cstuvwxjpyzA.",
+"  .BCDE*FGHqIJK.",
+"  .LMNOPQRSTAKU.",
 "   ............ ",
 "                ",
 "                "};
index 0bc602e..5256669 100644 (file)
@@ -1,52 +1,88 @@
 /* XPM */
 static char * dir_open_xpm[] = {
-"16 16 33 1",
+"16 16 69 1",
 "      c None",
 ".     c #000000",
-"+     c #A7B2DF",
-"@     c #7F86C7",
-"#     c #8390CD",
-"$     c #666BB1",
-"%     c #9297DE",
-"&     c #7177BF",
-"*     c #8992CF",
-"=     c #6E75BC",
-"-     c #6267AD",
-";     c #515381",
-">     c #424469",
-",     c #222334",
-"'     c #666BB3",
-")     c #D6DCF8",
-"!     c #DDE2FA",
-"~     c #C7D0EF",
-"{     c #393A5B",
-"]     c #484972",
-"^     c #E2E6FC",
-"/     c #BEC8E7",
-"(     c #929CCB",
-"_     c #BAC5E1",
-":     c #3E4066",
-"<     c #D0D4FA",
-"[     c #5F6693",
-"}     c #8892CE",
-"|     c #37385B",
-"1     c #D2D9F6",
-"2     c #515478",
-"3     c #A5ADE7",
-"4     c #6E78B1",
+"+     c #5695E8",
+"@     c #6FAAF5",
+"#     c #74AEF6",
+"$     c #4C89E6",
+"%     c #4B89E7",
+"&     c #5A98F0",
+"*     c #68A7F5",
+"=     c #67A6F4",
+"-     c #5593EE",
+";     c #4681E6",
+">     c #79AEF8",
+",     c #5F9DF4",
+"'     c #65A2F6",
+")     c #609DF4",
+"!     c #63A0F4",
+"~     c #5591F1",
+"{     c #67A2F4",
+"]     c #538FEF",
+"^     c #4780EC",
+"/     c #4C88ED",
+"(     c #5792F1",
+"_     c #224AA4",
+":     c #2957BE",
+"<     c #346ADB",
+"[     c #D2EAFD",
+"}     c #CFEAFD",
+"|     c #C6E6FD",
+"1     c #C4E5FD",
+"2     c #C4E4FD",
+"3     c #C2E3FD",
+"4     c #B8DDFB",
+"5     c #80BBF1",
+"6     c #1D3E8C",
+"7     c #2650B0",
+"8     c #AAD4F8",
+"9     c #AAD3F9",
+"0     c #ACD7FB",
+"a     c #A8D5FB",
+"b     c #A7D4FA",
+"c     c #9ECEF9",
+"d     c #67A7EB",
+"e     c #1C3A80",
+"f     c #204396",
+"g     c #9BCCF9",
+"h     c #98CBF9",
+"i     c #92C7F8",
+"j     c #71AEEF",
+"k     c #3470CA",
+"l     c #1D3D88",
+"m     c #94C9F9",
+"n     c #93C8F8",
+"o     c #80BDF5",
+"p     c #6BACEB",
+"q     c #1B3781",
+"r     c #88BFF7",
+"s     c #86BEF7",
+"t     c #84BEF7",
+"u     c #7FBAF6",
+"v     c #5E9EEA",
+"w     c #3064BF",
+"x     c #76B1F4",
+"y     c #75B1F5",
+"z     c #70AEF4",
+"A     c #6FADF4",
+"B     c #67A7F1",
+"C     c #64A4EF",
+"D     c #498BE7",
 "                ",
 "                ",
 "    ....        ",
-"   .+@+@.       ",
-"  .#$#$#$...... ",
-"  .%&*&*&*=-&-;.",
-" ...........>,'.",
-".)!~!~!~!~!~.{].",
-".^/(_(_(_(_(.{:.",
-" .<_(_(_(_(_[.:.",
-" .!}_(_(_(_(_.|.",
-"  .1(_(_(_(_(2..",
-"  .3(4(4(4(4(4..",
+"   .+@#$.       ",
+"  .%&*=-;...... ",
+"  .>,')!~{]^^/(.",
+" ..........._:<.",
+".[}|11212345.67.",
+".890abababcd.ef.",
+" .8gghhhhhijk.l.",
+" .8mmnnnnniop.q.",
+"  .grssssstuvw..",
+"  .xyzzzAzABCD..",
 "   ............ ",
 "                ",
 "                "};
index a824e34..e7fb862 100644 (file)
 /* XPM */
 static char * drafts_close_xpm[] = {
-"16 16 28 1",
+"16 16 86 1",
 "      c None",
 ".     c #000000",
-"+     c #A1ACDA",
-"@     c #7C83C1",
-"#     c #808CC7",
-"$     c #656AAB",
-"%     c #E5E9FD",
-"&     c #D4D7F6",
-"*     c #E9EBFD",
-"=     c #B1B6ED",
-"-     c #C6C9F8",
-";     c #CBD3F3",
-">     c #ACB4E5",
-",     c #C0C9E7",
-"'     c #A4ABDC",
-")     c #9BA5D9",
-"!     c #878DCE",
-"~     c #656AAD",
-"{     c #DDE1FA",
-"]     c #5C5D99",
-"^     c #545588",
-"/     c #8C97D0",
-"(     c #747CBF",
-"_     c #9AA1D7",
-":     c #7377BC",
-"<     c #4C4E77",
-"[     c #C6CFEE",
-"}     c #3C3E65",
+"+     c #4E8EE5",
+"@     c #6EACF4",
+"#     c #4885E3",
+"$     c #66A6EF",
+"%     c #63A2F1",
+"&     c #7AB5F6",
+"*     c #6FAAF5",
+"=     c #65A2F0",
+"-     c #4D8BE9",
+";     c #DDF1FE",
+">     c #D7EDFE",
+",     c #D5ECFE",
+"'     c #D3EBFE",
+")     c #CDE6FD",
+"!     c #B9DBFD",
+"~     c #B4D8FC",
+"{     c #AAD3FC",
+"]     c #94C4FA",
+"^     c #D0EAFE",
+"/     c #C0E2FD",
+"(     c #BADFFC",
+"_     c #B9DEFC",
+":     c #B5DBFC",
+"<     c #A9D2FB",
+"[     c #98C9FA",
+"}     c #90C2FA",
+"|     c #80B9F8",
+"1     c #639EF1",
+"2     c #CDE8FD",
+"3     c #ABD7FB",
+"4     c #A9D6FB",
+"5     c #A8D5FB",
+"6     c #A4D2FB",
+"7     c #9BCAFA",
+"8     c #8EC0F9",
+"9     c #83BBF9",
+"0     c #7CB4F8",
+"a     c #66A0F2",
+"b     c #4680E5",
+"c     c #CBE7FD",
+"d     c #B7DDFC",
+"e     c #A5D2FB",
+"f     c #A2D1FB",
+"g     c #96C8FA",
+"h     c #8ABFF9",
+"i     c #7DB5F8",
+"j     c #71ACF6",
+"k     c #5895EE",
+"l     c #386FDE",
+"m     c #CBE8FD",
+"n     c #A8D3FB",
+"o     c #74AEF7",
+"p     c #65A1F4",
+"q     c #4D88EA",
+"r     c #3468D5",
+"s     c #B1D8FB",
+"t     c #9FCFFA",
+"u     c #93C6F9",
+"v     c #87BEF9",
+"w     c #7FB9F8",
+"x     c #7AB3F8",
+"y     c #5691F0",
+"z     c #427EE5",
+"A     c #2F61CC",
+"B     c #C0E1FD",
+"C     c #9BC9F9",
+"D     c #80B8F6",
+"E     c #74AEF6",
+"F     c #6BA5F4",
+"G     c #639FF3",
+"H     c #5A94F0",
+"I     c #417CE4",
+"J     c #3469D8",
+"K     c #2957BE",
+"L     c #AAD4FB",
+"M     c #70AAF3",
+"N     c #538EEC",
+"O     c #4F89EA",
+"P     c #4F8AEC",
+"Q     c #4B87EA",
+"R     c #4683E8",
+"S     c #4076E1",
+"T     c #356AD8",
+"U     c #254EAB",
 "                ",
 "                ",
 "    ....        ",
-"   .+@+@.       ",
-"  .#$#$#$...... ",
-"  .%&*&*&%*=-;>.",
-"  .;+,+,+,')!+~.",
-"  .{,+,+,))!+!].",
-"  .;+,+,)+!+!!^.",
-"  .{,+,)+!+!/(^.",
-"  .;+,_+!+!!(:<.",
-"  .{,_+!+!!::~<.",
-"  .[]~]:]~]^<<}.",
+"   .+@@#.       ",
+"  .$%&*=-...... ",
+"  .;>,',',)!~{].",
+"  .^/(_(_:<[}|1.",
+"  .2_34567890ab.",
+"  .cd4efgh9ijkl.",
+"  .mdnfgh9iopqr.",
+"  .cstuvwxjpyzA.",
+"  .BCDE*FGHqIJK.",
+"  .LMNOPQRSTAKU.",
 "   ............ ",
 "                ",
 "                "};
index 20ddceb..7a02c27 100644 (file)
@@ -1,52 +1,88 @@
 /* XPM */
 static char * drafts_open_xpm[] = {
-"16 16 33 1",
+"16 16 69 1",
 "      c None",
 ".     c #000000",
-"+     c #A7B2DF",
-"@     c #7F86C7",
-"#     c #8390CD",
-"$     c #666BB1",
-"%     c #9297DE",
-"&     c #7177BF",
-"*     c #8992CF",
-"=     c #6E75BC",
-"-     c #6267AD",
-";     c #515381",
-">     c #424469",
-",     c #222334",
-"'     c #666BB3",
-")     c #D6DCF8",
-"!     c #DDE2FA",
-"~     c #C7D0EF",
-"{     c #393A5B",
-"]     c #484972",
-"^     c #E2E6FC",
-"/     c #BEC8E7",
-"(     c #929CCB",
-"_     c #BAC5E1",
-":     c #3E4066",
-"<     c #D0D4FA",
-"[     c #5F6693",
-"}     c #8892CE",
-"|     c #37385B",
-"1     c #D2D9F6",
-"2     c #515478",
-"3     c #A5ADE7",
-"4     c #6E78B1",
+"+     c #5695E8",
+"@     c #6FAAF5",
+"#     c #74AEF6",
+"$     c #4C89E6",
+"%     c #4B89E7",
+"&     c #5A98F0",
+"*     c #68A7F5",
+"=     c #67A6F4",
+"-     c #5593EE",
+";     c #4681E6",
+">     c #79AEF8",
+",     c #5F9DF4",
+"'     c #65A2F6",
+")     c #609DF4",
+"!     c #63A0F4",
+"~     c #5591F1",
+"{     c #67A2F4",
+"]     c #538FEF",
+"^     c #4780EC",
+"/     c #4C88ED",
+"(     c #5792F1",
+"_     c #224AA4",
+":     c #2957BE",
+"<     c #346ADB",
+"[     c #D2EAFD",
+"}     c #CFEAFD",
+"|     c #C6E6FD",
+"1     c #C4E5FD",
+"2     c #C4E4FD",
+"3     c #C2E3FD",
+"4     c #B8DDFB",
+"5     c #80BBF1",
+"6     c #1D3E8C",
+"7     c #2650B0",
+"8     c #AAD4F8",
+"9     c #AAD3F9",
+"0     c #ACD7FB",
+"a     c #A8D5FB",
+"b     c #A7D4FA",
+"c     c #9ECEF9",
+"d     c #67A7EB",
+"e     c #1C3A80",
+"f     c #204396",
+"g     c #9BCCF9",
+"h     c #98CBF9",
+"i     c #92C7F8",
+"j     c #71AEEF",
+"k     c #3470CA",
+"l     c #1D3D88",
+"m     c #94C9F9",
+"n     c #93C8F8",
+"o     c #80BDF5",
+"p     c #6BACEB",
+"q     c #1B3781",
+"r     c #88BFF7",
+"s     c #86BEF7",
+"t     c #84BEF7",
+"u     c #7FBAF6",
+"v     c #5E9EEA",
+"w     c #3064BF",
+"x     c #76B1F4",
+"y     c #75B1F5",
+"z     c #70AEF4",
+"A     c #6FADF4",
+"B     c #67A7F1",
+"C     c #64A4EF",
+"D     c #498BE7",
 "                ",
 "                ",
 "    ....        ",
-"   .+@+@.       ",
-"  .#$#$#$...... ",
-"  .%&*&*&*=-&-;.",
-" ...........>,'.",
-".)!~!~!~!~!~.{].",
-".^/(_(_(_(_(.{:.",
-" .<_(_(_(_(_[.:.",
-" .!}_(_(_(_(_.|.",
-"  .1(_(_(_(_(2..",
-"  .3(4(4(4(4(4..",
+"   .+@#$.       ",
+"  .%&*=-;...... ",
+"  .>,')!~{]^^/(.",
+" ..........._:<.",
+".[}|11212345.67.",
+".890abababcd.ef.",
+" .8gghhhhhijk.l.",
+" .8mmnnnnniop.q.",
+"  .grssssstuvw..",
+"  .xyzzzAzABCD..",
 "   ............ ",
 "                ",
 "                "};
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 3f035cb..0735a3c 100644 (file)
@@ -1,47 +1,97 @@
 /* XPM */
 static char * group_xpm[] = {
-"16 16 28 1",
+"16 16 78 1",
 "      c None",
 ".     c #000000",
-"+     c #75BB9A",
-"@     c #569D82",
-"#     c #59A285",
-"$     c #3F8871",
-"%     c #B8EADF",
-"&     c #A6DFC8",
-"*     c #BFEDE2",
-"=     c #85C6B3",
-"-     c #97D3CA",
-";     c #9CDABF",
-">     c #81C4A7",
-",     c #91D2AD",
-"'     c #77BC9D",
-")     c #70B798",
-"!     c #60A78C",
-"~     c #418972",
-"{     c #AFE5D4",
-"]     c #347B68",
-"^     c #276F60",
-"/     c #63AB8E",
-"(     c #4F987F",
-"_     c #6FB596",
-":     c #4F967D",
-"<     c #1B6556",
-"[     c #97D7B6",
-"}     c #0B554A",
+"+     c #83D47A",
+"@     c #9EE393",
+"#     c #7CD175",
+"$     c #99DF8D",
+"%     c #95DF8B",
+"&     c #A6E69C",
+"*     c #9DE494",
+"=     c #80D779",
+"-     c #EBFAE6",
+";     c #E8F9E3",
+">     c #E7F9E1",
+",     c #E6F8E0",
+"'     c #E0F6DA",
+")     c #D3F4CC",
+"!     c #CEF3C7",
+"~     c #C9F1C1",
+"{     c #B8EDAF",
+"]     c #E3F8DC",
+"^     c #DAF5D1",
+"/     c #D6F4CC",
+"(     c #D5F4CC",
+"_     c #D1F3C9",
+":     c #C9F0C0",
+"<     c #BEEDB3",
+"[     c #B6EDAD",
+"}     c #ABE9A1",
+"|     c #93DF8B",
+"1     c #E1F6DA",
+"2     c #CCF0C2",
+"3     c #CAF0C0",
+"4     c #C6F0BC",
+"5     c #BEEDB5",
+"6     c #B5ECAC",
+"7     c #ACEAA2",
+"8     c #A7E89E",
+"9     c #94E08C",
+"0     c #78D373",
+"a     c #DFF6D8",
+"b     c #D4F3CB",
+"c     c #C5EFBB",
+"d     c #BCEDB1",
+"e     c #B2EBA9",
+"f     c #A9E8A0",
+"g     c #A0E696",
+"h     c #88DC82",
+"i     c #68CC68",
+"j     c #E0F6D8",
+"k     c #A1E698",
+"l     c #94E28C",
+"m     c #7FD87A",
+"n     c #64C464",
+"o     c #CDF1C5",
+"p     c #C2EEB8",
+"q     c #B8ECAE",
+"r     c #B1EAA6",
+"s     c #A5E89C",
+"t     c #86DD81",
+"u     c #75D270",
+"v     c #5EBE5E",
+"w     c #ABE7A1",
+"x     c #99E391",
+"y     c #93E18B",
+"z     c #88DE84",
+"A     c #71D16F",
+"B     c #63C763",
+"C     c #59B35B",
+"D     c #CAF1C1",
+"E     c #9EE395",
+"F     c #82DA7E",
+"G     c #80D87C",
+"H     c #80D97B",
+"I     c #7CD878",
+"J     c #78D573",
+"K     c #6ED06E",
+"L     c #65C765",
+"M     c #53A355",
 "                ",
 "                ",
 "    ....        ",
-"   .+@+@.       ",
-"  .#$#$#$...... ",
-"  .%&*&*&%*=-;>.",
-"  .;+,+,+,')!+~.",
-"  .{,+,+,))!+!].",
-"  .;+,+,)+!+!!^.",
-"  .{,+,)+!+!/(^.",
-"  .;+,_+!+!!(:<.",
-"  .{,_+!+!!::~<.",
-"  .[]~]:]~]^<<}.",
+"   .+@@#.       ",
+"  .$%&*%=...... ",
+"  .-;>,>,>')!~{.",
+"  .]^/(/(_:<[}|.",
+"  .1(2334567890.",
+"  .ab34cde7fghi.",
+"  .jb:cde7fklmn.",
+"  .aopqr}sgltuv.",
+"  .^5wk*xyzmABC.",
+"  .DEFGHIJKLvCM.",
 "   ............ ",
 "                ",
 "                "};
index c5a864b..b3c31e4 100644 (file)
@@ -1,51 +1,50 @@
 /* XPM */
 static char * unread_xpm[] = {
-"13 10 38 1",
+"13 10 37 1",
 "      c None",
 ".     c #000000",
-"+     c #2828D5",
-"@     c #CECFF5",
-"#     c #D0D0F5",
-"$     c #CECEF5",
-"%     c #1B1B92",
-"&     c #CCCBF4",
-"*     c #CBCBF4",
-"=     c #CDCDF5",
-"-     c #8888E7",
-";     c #BAB8F1",
-">     c #CFCEF5",
-",     c #BDBAF1",
-"'     c #7572E3",
-")     c #2222B7",
-"!     c #C5C2F3",
-"~     c #CBC9F4",
-"{     c #C3C2F3",
-"]     c #2323BE",
-"^     c #2727D0",
-"/     c #CECDF5",
-"(     c #8881E6",
-"_     c #A29CEB",
-":     c #7068E1",
-"<     c #C8C6F3",
-"[     c #CDCBF4",
-"}     c #867FE6",
-"|     c #1B1B90",
-"1     c #B9B7F0",
-"2     c #6B6BE2",
-"3     c #5E5ADF",
-"4     c #8984E7",
-"5     c #A6A1EC",
-"6     c #9692E9",
-"7     c #746EE3",
-"8     c #9C99EA",
-"9     c #141469",
+"+     c #3D81C1",
+"@     c #D4E3F0",
+"#     c #D5E3F1",
+"$     c #2A5984",
+"%     c #D1E0EF",
+"&     c #D1E1EF",
+"*     c #D2E2F0",
+"=     c #94B9DC",
+"-     c #C0D5EA",
+";     c #D4E2F0",
+">     c #C2D5EA",
+",     c #80AAD6",
+"'     c #346FA6",
+")     c #C9D9ED",
+"!     c #CFDEEF",
+"~     c #C9DBED",
+"{     c #3673AC",
+"]     c #3B7EBD",
+"^     c #D2E1F0",
+"/     c #8EB0DA",
+"(     c #A6C1E2",
+"_     c #77A0D3",
+":     c #CCDCEE",
+"<     c #D1DFEF",
+"[     c #8CAFDA",
+"}     c #295883",
+"|     c #BFD4E9",
+"1     c #7AA9D4",
+"2     c #6B9CCF",
+"3     c #91B4DB",
+"4     c #ABC4E3",
+"5     c #9DBCDF",
+"6     c #7DA6D5",
+"7     c #A4C0E0",
+"8     c #1E4060",
 " ........... ",
-".+@##$$##$$%.",
-".$+$$#&$*=+-.",
-".$;+#$=>=+,'.",
-".#$$+#$#)!,,.",
-".~#{+]$^+/~(.",
-".#&+$>+/~+_:.",
-".$+*$><[~}|1.",
-".+2234}56789.",
+".+@##@@##@@$.",
+".@+@@#%@&*+=.",
+".@-+#@*;*+>,.",
+".#@@+#@#')>>.",
+".!#~+{@]+^!/.",
+".#%+@;+^!+(_.",
+".@+&@;:<![}|.",
+".+1123[45678.",
 " ........... "};
index 07c5fc4..b4ef2ea 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");