2007-03-15 [paul] 2.8.1cvs13

	* src/common/quoted-printable.c
		fix decoding of quoted-printable parts

diff --git a/ChangeLog b/ChangeLog
index 7b35c7621b6d7cbcafa64fa3b64b4b3fc282859e..8f10c6b573018f932fe0646fdb49ea8f6d08d4c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-15 [paul]      2.8.1cvs13
+
+       * src/common/quoted-printable.c
+               fix decoding of quoted-printable parts
+

 2007-03-14 [wwp]       2.8.1cvs12
 
        * src/gtk/logwindow.h
 2007-03-14 [wwp]       2.8.1cvs12
 
        * src/gtk/logwindow.h

diff --git a/PATCHSETS b/PATCHSETS
index 308980bfe9fda157be5fd97a26c13b0dd54f681e..5b22fd64183d5da4b2190c5f10dbf7a10c04febe 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2429,3 +2429,4 @@
 ( cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/gtk/logwindow.c;  ) > 2.8.1cvs10.patchset
 ( cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/logwindow.h;  ) > 2.8.1cvs11.patchset
 ( cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/logwindow.h;  ) > 2.8.1cvs12.patchset
 ( cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/gtk/logwindow.c;  ) > 2.8.1cvs10.patchset
 ( cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/logwindow.h;  ) > 2.8.1cvs11.patchset
 ( cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/logwindow.h;  ) > 2.8.1cvs12.patchset

+( cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/common/quoted-printable.c;  ) > 2.8.1cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 2b730bce2ba98a96256473ee6bdcf5d35942b441..712c915faa088d58a865b48c7f9682a02092eadd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index bf3cc89b8e344e1aa06d9fffdaa02a522215aac3..8cce7fd1d3e4c7f72a067ba8bc153e8ba03f5e75 100644 (file)
--- a/src/common/quoted-printable.c
+++ b/src/common/quoted-printable.c
@@ -90,10 +90,7 @@ gint qp_decode_line(gchar *str)
 
        while (*inp != '\0') {
                if (*inp == '=') {
 
        while (*inp != '\0') {
                if (*inp == '=') {

-                       if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') {
-                               inp += 3;
-                               continue;
-                       } else if (inp[1] && inp[2] &&
+                       if (inp[1] && inp[2] &&

                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;
                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;


@@ -122,10 +119,7 @@ gint qp_decode_const(gchar *out, gint avail, const gchar *str)
 
        while (*inp != '\0' && avail > 0) {
                if (*inp == '=') {
 
        while (*inp != '\0' && avail > 0) {
                if (*inp == '=') {

-                       if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') {
-                               inp += 3;
-                               continue;
-                       } else if (inp[1] && inp[2] &&
+                       if (inp[1] && inp[2] &&

                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;
                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;


@@ -158,10 +152,7 @@ gint qp_decode_q_encoding(guchar *out, const gchar *in, gint inlen)
 
        while (inp - in < inlen && *inp != '\0') {
                if (*inp == '=' && inp + 3 - in <= inlen) {
 
        while (inp - in < inlen && *inp != '\0') {
                if (*inp == '=' && inp + 3 - in <= inlen) {

-                       if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') {
-                               inp += 3;
-                               continue;
-                       } else if (get_hex_value(outp, inp[1], inp[2]) == TRUE) {
+                       if (get_hex_value(outp, inp[1], inp[2]) == TRUE) {

                                inp += 3;
                        } else {
                                *outp = *inp++;
                                inp += 3;
                        } else {
                                *outp = *inp++;