improve insert DOS/MAC file

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ae52c4c79fb5447b30d57ee15e37c3d7066b573f..e830eaa6de42d01339621260531f3d21278e539a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2001-10-24 [paul]      0.6.4claws2
+
+       * src/prefs_common.c
+               gettextize the gpg ascii-armored warning message
+
+       * src/compose.c
+               insert a DOS/MAC file into the composed message
+               (improvements)
+
+       * Both submitted by Thierry Godefroy <godefroy@imaginet.fr>
+
 2001-10-22 [paul]      0.6.4claws1
 
        * sync with sylpheed 0.6.4 release

diff --git a/configure.in b/configure.in
index 497532aec33e6783fd1aff5ea032a6d220aaf146..ad7b2b1ec915b01b6a6f9d690f860df9a4a2f3a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 191c3f0a3f702ba37c094162b74bd26d976a5d35..8dc5dc10550389a24e384e982d1a33162a710574 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1853,6 +1853,7 @@ static void compose_insert_file(Compose *compose, const gchar *file)
 {
        GtkSText *text = GTK_STEXT(compose->text);
        gchar buf[BUFFSIZE];
+       gint len;
        FILE *fp;
 
        g_return_if_fail(file != NULL);
@@ -1865,10 +1866,17 @@ static void compose_insert_file(Compose *compose, const gchar *file)
        gtk_stext_freeze(text);
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-               if (strlen(buf) > 1 && buf[strlen(buf) - 2] == '\r' && buf[strlen(buf) - 1] == '\n') {
-                       buf[strlen(buf) - 2] = '\n';
-                       buf[strlen(buf) - 1] = 0;
+               /* Strip <CR> if DOS/Windoze file, replace <CR> with <LF> if MAC file */
+               len = strlen(buf);
+               if (len > 1 && buf[len - 2] == '\r' && buf[len - 1] == '\n') {
+                       buf[len - 2] = '\n';
+                       buf[len - 1] = '\0';
+               } else {
+                       while (--len > 0)
+                               if (buf[len] == '\r')
+                                       buf[len] = '\n';
                }
+
                gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
        }