insert file with DOS line endings

diff --git a/AUTHORS b/AUTHORS
index a729532ecc3febc2273df8beb08db90e493b983f..4a170c612d9ea929f8cee450042c51aa7a4f014c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,3 +85,4 @@ contributors (beside the above; based on Changelog)
        Jeroen Versteeg
        Ravemax
        Jens Jahnke
+       Thierry Godefroy

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2167c6f1356cf27ec52d9a1753d37508b84d4622..9575878fdf280a45760ebe0d2d01524fe728638a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,17 @@
-2001-10-18 [hoa]        0.6.3claws29
+2001-10-21 [paul]      0.6.3claws30
+
+       * src/compose.c
+               insert a DOS text file from the compose window
+               into the composed message text (removes CRs characters)
+               Submitted by Thierry Godefroy <godefroy@imaginet.fr>
+
+       * tools/filter_conv.pl, tools/README
+               automatically use ~/.sylpheed as working directory
+               print out confirmation message on completion
+
+       * correct Hoa's last ChangeLog.claws entry
+
+2001-10-20 [hoa]        0.6.3claws29
 
        * src/grouplistdialog.c
                bugfix (another ?) to give the right

diff --git a/configure.in b/configure.in
index ffbd6bd8a6500b75200042bf740c6364e53002a7..12d5415d59da689c9c915e5dd985e8df9c31d05f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws29
+EXTRA_VERSION=claws30
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 9976a14d8b87fc9dcd3642188204cd78c358252d..191c3f0a3f702ba37c094162b74bd26d976a5d35 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1864,8 +1864,13 @@ static void compose_insert_file(Compose *compose, const gchar *file)
 
        gtk_stext_freeze(text);
 
-       while (fgets(buf, sizeof(buf), fp) != NULL)
-               gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+       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;
+               }
+               gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+       }
 
        gtk_stext_thaw(text);