From f4b37d7631c5641f0bfcc1cad5c8d6919b171d22 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 25 Jan 2012 16:38:08 -0600 Subject: [PATCH] Fix linear alphabet string errors (cherry picked from commit 80bc593eb31b3162fd870ee64eceb0ec90fac15c) --- NewsLog.txt | 2 +- kioslaves/imap4/rfcdecoder.cc | 2 +- libkmime/kmime_util.cpp | 2 +- mimelib/dw_cte.cpp | 2 +- mimelib/mediatyp.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NewsLog.txt b/NewsLog.txt index 93e34ec3..5462a516 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1960,7 +1960,7 @@ Bugfixes deleted without ever having been initialised. Also init some other vars ASAP. (700035) - kolab/issue1712 Update revision when adding new attendees.(663228) - kolab/issue1672 Make sure to open the folder when saving a single message as well.(664661) - - Fix lack of double-quotes around folder name, making GEQUOTAROOT fail on folders with a space in the + - Fix lack of double-quotes around folder name, making GETQUOTAROOT fail on folders with a space in the name.(665276) - Port the ability to add and remove subfolders from korganizer's resource view from proko2. (665274) - kolab/issue1721 Don't exit when the popup menu is canceled.(665679) diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc index f91e9f8d..08b641b7 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/kioslaves/imap4/rfcdecoder.cc @@ -37,7 +37,7 @@ // adapted to QT-Toolkit by Sven Carstens 2000 static unsigned char base64chars[] = - "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,"; + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+,"; #define UNDEFINED 64 #define MAXLINE 76 diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 9e0f7703..c717f743 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -337,7 +337,7 @@ TQCString encodeRFC2047String(const TQString &src, const char *charset, TQCString uniqueString() { - static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"; + static char chars[] = "0123456789abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; time_t now; TQCString ret; char p[11]; diff --git a/mimelib/dw_cte.cpp b/mimelib/dw_cte.cpp index 127a29aa..4498597d 100644 --- a/mimelib/dw_cte.cpp +++ b/mimelib/dw_cte.cpp @@ -353,7 +353,7 @@ static int to_cr(const char* srcBuf, size_t srcLen, char* destBuf, } -static char base64tab[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" +static char base64tab[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz0123456789+/"; static char base64idx[128] = { diff --git a/mimelib/mediatyp.cpp b/mimelib/mediatyp.cpp index 87ee345e..7c766fe3 100644 --- a/mimelib/mediatyp.cpp +++ b/mimelib/mediatyp.cpp @@ -231,7 +231,7 @@ void DwMediaType::SetBoundary(const DwString& aStr) void DwMediaType::CreateBoundary(unsigned aLevel) { // Create a random printable string and set it as the boundary parameter - static const char c[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + static const char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const int cLen = 64; char buf[80]; strcpy(buf, "Boundary-");