2006-02-05 [colin] 2.0.0cvs16

	* src/common/utils.c
		Don't check for return-path (or we can't put
		back non-sent mails)

diff --git a/ChangeLog b/ChangeLog
index 2b7e8d03a7dc53e1e3f006888a96dcd4481fd929..88ad8ada451815c8b432fb0227ee0e209344097b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-05 [colin]     2.0.0cvs16
+
+       * src/common/utils.c
+               Don't check for return-path (or we can't put
+               back non-sent mails)
+
 2006-02-05 [colin]     2.0.0cvs15
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index a6056974172ff480a4add937d9a4bf869ba9da5b..24e72db7f0491500308d69e926d674e750ce8135 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1199,3 +1199,4 @@
 ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/headerview.c;  cvs diff -u -r 1.47.2.25 -r 1.47.2.26 src/procheader.c;  cvs diff -u -r 1.150.2.49 -r 1.150.2.50 src/procmsg.c;  cvs diff -u -r 1.60.2.20 -r 1.60.2.21 src/procmsg.h;  cvs diff -u -r 1.96.2.91 -r 1.96.2.92 src/textview.c;  ) > 2.0.0cvs13.patchset
 ( diff -u /dev/null tools/tbird2syl.py;  cvs diff -u -r 1.25.2.8 -r 1.25.2.9 tools/Makefile.am;  ) > 2.0.0cvs14.patchset
 ( cvs diff -u -r 1.96.2.92 -r 1.96.2.93 src/textview.c;  ) > 2.0.0cvs15.patchset
+( cvs diff -u -r 1.36.2.54 -r 1.36.2.55 src/common/utils.c;  ) > 2.0.0cvs16.patchset

diff --git a/configure.ac b/configure.ac
index 6f65e2ec68a66477f592ea6c03a1aa641635e709..1877c5e5ecac86ca8e201bbe78cb287e50fdbada 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 0d0b0d487cffe24fcafdfc84644257674f55f474..70383d53edcd343c10ae39b54171383d72fa1ec5 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -4758,10 +4758,8 @@ gboolean file_is_email (const gchar *filename)
                return FALSE;
        if ((fp = g_fopen(filename, "rb")) == NULL)
                return FALSE;
-       while (i < 60 && score < 4
+       while (i < 60 && score < 3
               && fgets(buffer, sizeof (buffer), fp) > 0) {
-               if (!strncmp(buffer, "Return-Path:", strlen("Return-Path:")))
-                       score++;
                if (!strncmp(buffer, "From:", strlen("From:")))
                        score++;
                if (!strncmp(buffer, "To:", strlen("To:")))
@@ -4771,5 +4769,5 @@ gboolean file_is_email (const gchar *filename)
                i++;
        }
        fclose(fp);
-       return (score >= 4);
+       return (score >= 3);
 }