From 80bc593eb31b3162fd870ee64eceb0ec90fac15c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 25 Jan 2012 16:38:08 -0600 Subject: Fix linear alphabet string errors --- NewsLog.txt | 2 +- kioslaves/imap4/imap4.cc | 10 +++++----- kioslaves/imap4/imapcommand.cc | 2 +- kioslaves/imap4/imapcommand.h | 4 ++-- kioslaves/imap4/imapparser.cc | 4 ++-- kioslaves/imap4/rfcdecoder.cc | 2 +- libkmime/kmime_util.cpp | 2 +- mimelib/dw_cte.cpp | 2 +- mimelib/mediatyp.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NewsLog.txt b/NewsLog.txt index bc32c09d..cc5cdc4c 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/imap4.cc b/kioslaves/imap4/imap4.cc index 98714495..81a941b3 100644 --- a/kioslaves/imap4/imap4.cc +++ b/kioslaves/imap4/imap4.cc @@ -1718,7 +1718,7 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo); switch( command ) { - case 'R': // GEQUOTAROOT + case 'R': // GETQUOTAROOT { kdDebug(7116) << "QUOTAROOT " << aBox << endl; imapCommand *cmd = doCommand(imapCommand::clientGetQuotaroot( aBox ) ); @@ -1734,15 +1734,15 @@ IMAP4Protocol::specialQuotaCommand( int command, TQDataStream& stream ) finished(); break; } - case 'G': // GEQUOTA + case 'G': // GETQUOTA { - kdDebug(7116) << "GEQUOTA command" << endl; + kdDebug(7116) << "GETQUOTA command" << endl; kdWarning(7116) << "UNIMPLEMENTED" << endl; break; } - case 'S': // SEQUOTA + case 'S': // SETQUOTA { - kdDebug(7116) << "SEQUOTA command" << endl; + kdDebug(7116) << "SETQUOTA command" << endl; kdWarning(7116) << "UNIMPLEMENTED" << endl; break; } diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc index 4c2ac2d1..4b9faadf 100644 --- a/kioslaves/imap4/imapcommand.cc +++ b/kioslaves/imap4/imapcommand.cc @@ -397,7 +397,7 @@ imapCommand * imapCommand::clientGetQuotaroot( const TQString& box ) { TQString parameter = TQString("\"") + rfcDecoder::toIMAP (box) + '"'; - return new imapCommand ("GEQUOTAROOT", parameter); + return new imapCommand ("GETQUOTAROOT", parameter); } imapCommand * diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h index 4c955202..9e283442 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/kioslaves/imap4/imapcommand.h @@ -365,9 +365,9 @@ public: static imapCommand *clientNamespace (); /** - * @brief Create a GEQUOTAROOT command + * @brief Create a GETQUOTAROOT command * @param box mailbox name - * @return a GEQUOTAROOT imapCommand + * @return a GETQUOTAROOT imapCommand */ static imapCommand *clientGetQuotaroot ( const TQString& box ); diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 6ba434a4..6bd31366 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -128,8 +128,8 @@ imapParser::sendCommand (imapCommand * aCmd) || command == "MYRIGHTS" || command == "GETANNOTATION" || command == "NAMESPACE" - || command == "GEQUOTAROOT" - || command == "GEQUOTA" + || command == "GETQUOTAROOT" + || command == "GETQUOTA" || command == "X-GET-OTHER-USERS" || command == "X-GET-DELEGATES" || command == "X-GET-OUT-OF-OFFICE") 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 d4c8943f..03a14e9a 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-"); -- cgit v1.2.3