2007-01-05 [colin] 2.6.1cvs107

	* src/common/quoted-printable.c
		Fix previous commit about bug 1089
		Thanks to Ralf

diff --git a/ChangeLog b/ChangeLog
index 5d5143066c9b93abfed180fc34b187dc21bb312f..9ce669a1e18f4a711d25bb9ed46fae00b4d9d2e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-01-05 [colin]     2.6.1cvs107
+
+       * src/common/quoted-printable.c
+               Fix previous commit about bug 1089
+               Thanks to Ralf
+
+2007-01-05 [colin]     2.6.1cvs106
+
+       * src/common/quoted-printable.c
+               Fix my previous commit on bug 1089
+               - Thanks to Ralf :)
+
 2007-01-04 [colin]     2.6.1cvs105
 
        * src/common/quoted-printable.c

diff --git a/PATCHSETS b/PATCHSETS
index 3d22b5037944844ec1b195fd166c3e41614d6701..4805248038796ef3eabdee2bc2abd4be6ffaee7b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2213,3 +2213,5 @@
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/image_viewer.c;  cvs diff -u -r 1.94.2.114 -r 1.94.2.115 src/messageview.c;  ) > 2.6.1cvs103.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/image_viewer.c;  ) > 2.6.1cvs104.patchset
 ( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/common/quoted-printable.c;  ) > 2.6.1cvs105.patchset
+( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/quoted-printable.c;  ) > 2.6.1cvs106.patchset
+( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/quoted-printable.c;  ) > 2.6.1cvs107.patchset

diff --git a/configure.ac b/configure.ac
index 46a052d26836a9315bf74fd8ac73991706523dcc..592b575125dc8fff0e2bb700a56ef0e555157191 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=105
+EXTRA_VERSION=107
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index 2cebddad359e313b10fb974bb3904efe54f456e4..4293f4b6ea6a0974d2a174ff099d3780f509c887 100644 (file)
--- a/src/common/quoted-printable.c
+++ b/src/common/quoted-printable.c
@@ -92,7 +92,7 @@ gint qp_decode_line(gchar *str)
                if (*inp == '=') {
                        if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0')
                                inp += 3;
-                       if (inp[1] && inp[2] &&
+                       else if (inp[1] && inp[2] &&
                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;
@@ -123,7 +123,7 @@ gint qp_decode_const(gchar *out, gint avail, const gchar *str)
                if (*inp == '=') {
                        if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0')
                                inp += 3;
-                       if (inp[1] && inp[2] &&
+                       else if (inp[1] && inp[2] &&
                            get_hex_value((guchar *)outp, inp[1], inp[2])
                            == TRUE) {
                                inp += 3;
@@ -158,7 +158,7 @@ gint qp_decode_q_encoding(guchar *out, const gchar *in, gint inlen)
                if (*inp == '=' && inp + 3 - in <= inlen) {
                        if (inp[1] == '0' && inp[2] == '0')
                                inp += 3;
-                       if (get_hex_value(outp, inp[1], inp[2]) == TRUE) {
+                       else if (get_hex_value(outp, inp[1], inp[2]) == TRUE) {
                                inp += 3;
                        } else {
                                *outp = *inp++;