Update of /cvsroot/mahogany/M/src/mail
In directory usw-pr-cvs1:/tmp/cvs-serv3800/src/mail
Modified Files:
HeaderIterator.cpp LogCircle.cpp MFCache.cpp MFPool.cpp
MailFolder.cpp MailFolderCC.cpp MailFolderCmn.cpp MailMH.cpp
Message.cpp MessageCC.cpp Pop3.cpp SendMessageCC.cpp
ThreadJWZ.cpp
Log Message:
more Unicode fixes
Index: HeaderIterator.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/HeaderIterator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- HeaderIterator.cpp 8 Sep 2002 19:23:11 -0000 1.3
+++ HeaderIterator.cpp 12 Sep 2002 02:36:50 -0000 1.4
@@ -73,5 +73,5 @@
{
// this is not supposed to happen in RFC822 headers!
- wxLogDebug("Bare '\\r' in header ignored");
+ wxLogDebug(_T("Bare '\\r' in header ignored"));
continue;
}
@@ -87,5 +87,5 @@
{
// but have seen something -- this is not normal
- wxLogDebug("Header line '%s' is malformed; ignored.",
+ wxLogDebug(_T("Header line '%s' is malformed; ignored."),
m_str.c_str());
}
@@ -98,5 +98,5 @@
if ( m_pcCurrent[1] != '\0' )
{
- wxLogDebug("Blank line inside header?");
+ wxLogDebug(_T("Blank line inside header?"));
}
}
@@ -107,5 +107,5 @@
{
// suspicious...
- wxLogDebug("Empty header value?");
+ wxLogDebug(_T("Empty header value?"));
}
@@ -144,5 +144,5 @@
// 822bis), it is quite uncommon and so may indicate a
// problem -- log it
- wxLogDebug("Header without space after colon?");
+ wxLogDebug(_T("Header without space after colon?"));
}
@@ -163,5 +163,5 @@
{
// make values and names arrays always of the same size
- wxLogDebug("Last header didn't have a valid value!");
+ wxLogDebug(_T("Last header didn't have a valid value!"));
if ( value )
Index: LogCircle.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/LogCircle.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- LogCircle.cpp 4 Jul 2002 17:22:37 -0000 1.1
+++ LogCircle.cpp 12 Sep 2002 02:36:50 -0000 1.2
@@ -55,5 +55,5 @@
for(int i = m_Next-1; i >= 0 ; i--)
{
- wxLogTrace("logcircle", "checking msg %d, %s", i, m_Messages[i].c_str());
+ wxLogTrace(_T("logcircle"), _T("checking msg %d, %s"), i,
+m_Messages[i].c_str());
if(m_Messages[i].Contains(needle))
{
@@ -65,5 +65,5 @@
for(int i = m_N-1; i >= m_Next; i--)
{
- wxLogTrace("logcircle", "checking msg %d, %s", i, m_Messages[i].c_str());
+ wxLogTrace(_T("logcircle"), _T("checking msg %d, %s"), i,
+m_Messages[i].c_str());
if(m_Messages[i].Contains(needle))
{
Index: MFCache.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFCache.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -u -2 -r1.21 -r1.22
--- MFCache.cpp 8 Sep 2002 19:23:11 -0000 1.21
+++ MFCache.cpp 12 Sep 2002 02:36:50 -0000 1.22
@@ -168,5 +168,5 @@
{
wxLogTrace(M_TRACE_MFSTATUS,
- "Added status for '%s' (%lu total, %lu unread)",
+ _T("Added status for '%s' (%lu total, %lu unread)"),
folderName.c_str(), status.total, status.unread);
@@ -185,5 +185,5 @@
wxLogTrace(M_TRACE_MFSTATUS,
- "Changed status for '%s' (%lu total, %lu unread)",
+ _T("Changed status for '%s' (%lu total, %lu unread)"),
folderName.c_str(), status.total, status.unread);
}
@@ -199,5 +199,5 @@
void MfStatusCache::InvalidateStatus(const String& folderName)
{
- wxLogTrace(M_TRACE_MFSTATUS, "Invalidated status for '%s'",
+ wxLogTrace(M_TRACE_MFSTATUS, _T("Invalidated status for '%s'"),
folderName.c_str());
@@ -349,5 +349,5 @@
else
{
- wxLogDebug("Removing deleted folder '%s' from status cache.",
+ wxLogDebug(_T("Removing deleted folder '%s' from status cache."),
name.c_str());
}
Index: MFPool.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFPool.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- MFPool.cpp 8 Sep 2002 19:23:11 -0000 1.6
+++ MFPool.cpp 12 Sep 2002 02:36:50 -0000 1.7
@@ -209,5 +209,5 @@
pool->connections.push_back(new MFConnection(mf, spec));
- wxLogTrace(TRACE_MFPOOL, "Added '%s' to the pool.", mf->GetName().c_str());
+ wxLogTrace(TRACE_MFPOOL, _T("Added '%s' to the pool."), mf->GetName().c_str());
}
@@ -253,5 +253,5 @@
if ( i->mf == mf )
{
- wxLogTrace(TRACE_MFPOOL, "Removing '%s' from the pool.",
+ wxLogTrace(TRACE_MFPOOL, _T("Removing '%s' from the pool."),
mf->GetName().c_str());
@@ -270,5 +270,5 @@
void MFPool::DeleteAll()
{
- wxLogTrace(TRACE_MFPOOL, "Clearing the pool.");
+ wxLogTrace(TRACE_MFPOOL, _T("Clearing the pool."));
for ( MFClassPoolList::iterator pool = gs_pool.begin();
Index: MailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolder.cpp,v
retrieving revision 1.292
retrieving revision 1.293
diff -b -u -2 -r1.292 -r1.293
--- MailFolder.cpp 8 Sep 2002 20:23:07 -0000 1.292
+++ MailFolder.cpp 12 Sep 2002 02:36:50 -0000 1.293
@@ -461,5 +461,5 @@
if ( strncmp(++p, "mailto:";, MAILTO_LEN) != 0 )
{
- wxLogDebug("Unknown URL scheme in List-Post (%s)",
+ wxLogDebug(_T("Unknown URL scheme in List-Post (%s)"),
listPostHeader.c_str());
return "";
@@ -515,5 +515,5 @@
// this is just for me, so that I could check for possible bugs in
// this code
- wxLogDebug("Malformed List-Post header '%s'!",
+ wxLogDebug(_T("Malformed List-Post header '%s'!"),
listPostHeader.c_str());
return "";
@@ -538,5 +538,5 @@
if ( rk < 0 || rk >= MailFolder::REPLY )
{
- wxLogDebug("Corrupted config data: invalid MP_DEFAULT_REPLY_KIND!");
+ wxLogDebug(_T("Corrupted config data: invalid MP_DEFAULT_REPLY_KIND!"));
rk = MailFolder::REPLY_SENDER;
@@ -1149,5 +1149,5 @@
{
// this shouldn't normally happen, but if it does just make it up
- wxLogDebug("Couldn't find from header in the message");
+ wxLogDebug(_T("Couldn't find from header in the message"));
fromLine += "MAHOGANY-DUMMY-SENDER";
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.640
retrieving revision 1.641
diff -b -u -2 -r1.640 -r1.641
--- MailFolderCC.cpp 8 Sep 2002 19:23:11 -0000 1.640
+++ MailFolderCC.cpp 12 Sep 2002 02:36:50 -0000 1.641
@@ -430,5 +430,5 @@
else
{
- wxLogTrace(TRACE_MF_CALLS, "Closing connection to '%s'",
+ wxLogTrace(TRACE_MF_CALLS, _T("Closing connection to '%s'"),
folder->GetFullName().c_str());
@@ -1479,5 +1479,5 @@
if ( !*p )
{
- wxLogDebug("Invalid encoded word syntax in '%s': missing charset.",
+ wxLogDebug(_T("Invalid encoded word syntax in '%s': missing charset."),
pEncWordStart);
out += pEncWordStart;
@@ -1511,5 +1511,5 @@
if ( enc2047 == Encoding_Unknown )
{
- wxLogDebug("Unrecognized header encoding in '%s'.",
+ wxLogDebug(_T("Unrecognized header encoding in '%s'."),
pEncWordStart);
@@ -1518,5 +1518,5 @@
if ( !pEncWordEnd )
{
- wxLogDebug("Missing encoded word end marker in '%s'.",
+ wxLogDebug(_T("Missing encoded word end marker in '%s'."),
pEncWordStart);
out += pEncWordStart;
@@ -1552,5 +1552,5 @@
if ( !*p )
{
- wxLogDebug("Missing encoded word end marker in '%s'.",
+ wxLogDebug(_T("Missing encoded word end marker in '%s'."),
pEncWordStart);
out += pEncWordStart;
@@ -1773,5 +1773,5 @@
// exist
{
- wxLogTrace(TRACE_MF_CALLS, "Trying to open MailFolderCC '%s' first.",
+ wxLogTrace(TRACE_MF_CALLS, _T("Trying to open MailFolderCC '%s' first."),
imapspec.c_str());
@@ -1793,5 +1793,5 @@
if ( !stream || stream->halfopen )
{
- wxLogTrace(TRACE_MF_CALLS, "Creating MailFolderCC '%s'.",
+ wxLogTrace(TRACE_MF_CALLS, _T("Creating MailFolderCC '%s'."),
imapspec.c_str());
@@ -1806,5 +1806,5 @@
// and try to open it again now
- wxLogTrace(TRACE_MF_CALLS, "Opening MailFolderCC '%s' after creating it.",
+ wxLogTrace(TRACE_MF_CALLS, _T("Opening MailFolderCC '%s' after creating it."),
imapspec.c_str());
@@ -1931,5 +1931,5 @@
tmp << cclient_drivers[format] << '/';
- wxLogDebug("Trying to create folder '%s' in %s format.",
+ wxLogDebug(_T("Trying to create folder '%s' in %s format."),
GetName().c_str(), cclient_drivers[format]);
}
@@ -2072,5 +2072,5 @@
MailFolderCC::Open(OpenMode openmode)
{
- wxLogTrace(TRACE_MF_CALLS, "%s \"'%s'\"",
+ wxLogTrace(TRACE_MF_CALLS, _T("%s \"'%s'\""),
GetOperationName(openmode).c_str(), GetName().c_str());
@@ -2191,5 +2191,5 @@
}
- wxLogTrace(TRACE_MF_CALLS, "Opening MailFolderCC '%s'.",
+ wxLogTrace(TRACE_MF_CALLS, _T("Opening MailFolderCC '%s'."),
m_ImapSpec.c_str());
@@ -2217,5 +2217,5 @@
}
- wxLogTrace(TRACE_MF_CALLS, "Half opening MailFolderCC '%s'.",
+ wxLogTrace(TRACE_MF_CALLS, _T("Half opening MailFolderCC '%s'."),
m_ImapSpec.c_str());
@@ -2325,5 +2325,5 @@
MailFolderCC::Close()
{
- wxLogTrace(TRACE_MF_CALLS, "Closing folder '%s'", GetName().c_str());
+ wxLogTrace(TRACE_MF_CALLS, _T("Closing folder '%s'"), GetName().c_str());
MailFolderCmn::Close();
@@ -2592,5 +2592,5 @@
if ( lock )
{
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC::Checkpoint() on %s.",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC::Checkpoint() on %s."),
GetName().c_str());
@@ -2621,5 +2621,5 @@
{
wxLogTrace(TRACE_MF_CALLS,
- "MailFolderCC::Ping() forcing close on folder %s.",
+ _T("MailFolderCC::Ping() forcing close on folder %s."),
GetName().c_str());
@@ -2680,5 +2680,5 @@
CHECK( m_MailStream, false, _T("PingOpenedFolder() called for closed folder") );
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC::Ping(%s)", GetName().c_str());
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC::Ping(%s)"), GetName().c_str());
return mail_ping(m_MailStream) != NIL;
@@ -2767,5 +2767,5 @@
MMStatusRedirector statusRedir(spec, mailstatus);
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC::CheckStatus() on %s.",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC::CheckStatus() on %s."),
spec.c_str());
@@ -2909,5 +2909,5 @@
MailFolderCC::AppendMessage(const String& msg)
{
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::AppendMessage(string)",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::AppendMessage(string)"),
GetName().c_str());
@@ -2933,5 +2933,5 @@
MailFolderCC::AppendMessage(const Message& msg)
{
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::AppendMessage(Message)",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::AppendMessage(Message)"),
GetName().c_str());
@@ -2994,5 +2994,5 @@
CHECK( count, true, _T("SaveMessages(): nothing to save") );
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::SaveMessages(%s)",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::SaveMessages(%s)"),
GetName().c_str(), folder->GetFullName().c_str());
@@ -3238,5 +3238,5 @@
CHECK( m_MailStream, false, _T("DoCountMessages: folder is closed") );
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::DoCountMessages()",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::DoCountMessages()"),
GetName().c_str());
@@ -3601,5 +3601,5 @@
CHECK( m_MailStream, 0, _T("SetSequenceFlag: folder is closed") );
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::SetFlags(%s) = %s",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::SetFlags(%s) = %s"),
GetName().c_str(), sequence.c_str(), flags.c_str());
@@ -3825,5 +3825,5 @@
// the controls in the sort dialog (there are no checks there,
// just ignore it here instead of giving an error)
- wxLogDebug("Unexpected MSO_NONE in the sort order");
+ wxLogDebug(_T("Unexpected MSO_NONE in the sort order"));
continue;
@@ -3854,5 +3854,5 @@
if ( pgmSort )
{
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::SortMessages()",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::SortMessages()"),
GetName().c_str());
@@ -4028,5 +4028,5 @@
// do server side threading
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC(%s)::ThreadMessages()",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC(%s)::ThreadMessages()"),
GetName().c_str());
@@ -4086,5 +4086,5 @@
String sequence = seq.GetString();
- wxLogTrace(TRACE_MF_CALLS, "Retrieving headers %s for '%s'...",
+ wxLogTrace(TRACE_MF_CALLS, _T("Retrieving headers %s for '%s'..."),
sequence.c_str(), GetName().c_str());
@@ -4183,6 +4183,5 @@
if ( overviewData->Done() )
{
- wxLogDebug("New message(s) appeared in folder while overviewing it, "
- "ignored.");
+ wxLogDebug(_T("New message(s) appeared in folder while overviewing it,
+ignored."));
// stop overviewing
@@ -4236,6 +4235,5 @@
// smart about this so far anyhow as we can't display the
// different fields in different encodings
- wxLogDebug("Different encodings for From and To fields, "
- "From may be displayed incorrectly.");
+ wxLogDebug(_T("Different encodings for From and To fields, From may be
+displayed incorrectly."));
}
else
@@ -4253,6 +4251,5 @@
if ( encodingMsg != wxFONTENCODING_SYSTEM )
{
- wxLogDebug("Different encodings for From and Subject fields, "
- "subject may be displayed incorrectly.");
+ wxLogDebug(_T("Different encodings for From and Subject fields, subject may
+be displayed incorrectly."));
}
else
@@ -4300,5 +4297,5 @@
if ( !stream || stream->halfopen )
{
- wxLogDebug("mm_exists() for not opened folder '%s' ignored.",
+ wxLogDebug(_T("mm_exists() for not opened folder '%s' ignored."),
GetName().c_str());
@@ -4316,5 +4313,5 @@
if ( m_headers )
{
- wxLogTrace(TRACE_MF_EVENTS, "Adding msgno %u to headers", (unsigned
int)msgnoMax);
+ wxLogTrace(TRACE_MF_EVENTS, _T("Adding msgno %u to headers"), (unsigned
+int)msgnoMax);
m_headers->OnAdd(msgnoMax);
@@ -4421,5 +4418,5 @@
}
- wxLogTrace(TRACE_MF_EVENTS, "Removing msgno %u from headers", (unsigned
int)msgno);
+ wxLogTrace(TRACE_MF_EVENTS, _T("Removing msgno %u from headers"), (unsigned
+int)msgno);
m_headers->OnRemove(idx);
@@ -4464,5 +4461,5 @@
ASSERT_MSG( m_gotUnprocessedNewMail, _T("OnNewMail: why are we called?") );
- wxLogTrace(TRACE_MF_EVENTS, "Got new mail notification for '%s'",
+ wxLogTrace(TRACE_MF_EVENTS, _T("Got new mail notification for '%s'"),
GetName().c_str());
@@ -4497,5 +4494,5 @@
// use "%ld" to print UID_ILLEGAL as -1 although it's really
// unsigned
- wxLogTrace(TRACE_MF_NEWMAIL, "Folder %s: last new UID %ld -> %ld",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("Folder %s: last new UID %ld -> %ld"),
GetName().c_str(), m_uidLastNew, uidsNew->Last());
@@ -4647,5 +4644,5 @@
CCStreamCleaner::~CCStreamCleaner()
{
- wxLogTrace(TRACE_MF_CALLS, "CCStreamCleaner: checking for left-over streams");
+ wxLogTrace(TRACE_MF_CALLS, _T("CCStreamCleaner: checking for left-over streams"));
// don't send us any notifications any more
@@ -4871,5 +4868,5 @@
CHECK_RET(mf, _T("mm_status for non existent folder"));
- wxLogTrace(TRACE_MF_CALLBACK, "mm_status: folder '%s', %lu messages",
+ wxLogTrace(TRACE_MF_CALLBACK, _T("mm_status: folder '%s', %lu messages"),
mf->m_ImapSpec.c_str(), status->messages);
@@ -5283,5 +5280,5 @@
MailFolderCC::Rename(const MFolder *mfolder, const String& name)
{
- wxLogTrace(TRACE_MF_CALLS, "MailFolderCC::Rename(): %s -> %s",
+ wxLogTrace(TRACE_MF_CALLS, _T("MailFolderCC::Rename(): %s -> %s"),
mfolder->GetPath().c_str(), name.c_str());
@@ -5325,5 +5322,5 @@
login);
- wxLogTrace(TRACE_MF_CALLS, "Clearing folder '%s'", fullname.c_str());
+ wxLogTrace(TRACE_MF_CALLS, _T("Clearing folder '%s'"), fullname.c_str());
// if this folder is opened, use its stream - and also notify about message
@@ -5450,5 +5447,5 @@
wxLogTrace(TRACE_MF_CALLS,
- "MailFolderCC::DeleteFolder(%s)", mboxpath.c_str());
+ _T("MailFolderCC::DeleteFolder(%s)"), mboxpath.c_str());
return mail_delete(NIL, (char *) mboxpath.c_str()) != NIL;
@@ -5582,35 +5579,35 @@
#define TRACE_CALLBACK0(name) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s)%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(%s)%s"), \
#name, GetStreamMailbox(stream), \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK1(name, fmt, parm) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(%s, " fmt ")%s"), \
#name, GetStreamMailbox(stream), parm, \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK2(name, fmt, parm1, parm2) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(%s, " fmt ")%s"), \
#name, GetStreamMailbox(stream), parm1, parm2, \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK3(name, fmt, parm1, parm2, parm3) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(%s, " fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(%s, " fmt ")%s"), \
#name, GetStreamMailbox(stream), parm1, parm2, parm3, \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_1(name, fmt, parm1) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(" fmt ")%s"), \
#name, parm1, \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_2(name, fmt, parm1, parm2) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(" fmt ")%s"), \
#name, parm1, parm2, \
mm_disable_callbacks ? " [disabled]" : "")
#define TRACE_CALLBACK_NOSTREAM_5(name, fmt, parm1, parm2, parm3, parm4, parm5) \
- wxLogTrace(TRACE_MF_CALLBACK, "%s(" fmt ")%s", \
+ wxLogTrace(TRACE_MF_CALLBACK, _T("%s(" fmt ")%s"), \
#name, parm1, parm2, parm3, parm4, parm5, \
mm_disable_callbacks ? " [disabled]" : "")
@@ -5872,5 +5869,5 @@
{
wxLogTrace(TRACE_SERVER_CACHE,
- "Deleting server entry for %s(%s).",
+ _T("Deleting server entry for %s(%s)."),
m_netmbx.host, m_netmbx.user);
@@ -5958,5 +5955,5 @@
wxLogTrace(TRACE_SERVER_CACHE,
- "Keeping connection to %s alive for %d seconds.",
+ _T("Keeping connection to %s alive for %d seconds."),
stream->mailbox, (int)delay);
@@ -5972,5 +5969,5 @@
{
wxLogTrace(TRACE_SERVER_CACHE,
- "Starting connection clean up timer (delay = %ds)", (int)delay);
+ _T("Starting connection clean up timer (delay = %ds)"), (int)delay);
// we want to use a smaller interval
@@ -6003,5 +6000,5 @@
wxLogTrace(TRACE_SERVER_CACHE,
- "Connection to %s timed out, closing.", stream->mailbox);
+ _T("Connection to %s timed out, closing."), stream->mailbox);
// we're not interested in getting mail_close() babble
@@ -6042,5 +6039,5 @@
{
// timer will be restarted in KeepStream() when/if neecessary
- wxLogTrace(TRACE_SERVER_CACHE, "Stopping connection clean up timer");
+ wxLogTrace(TRACE_SERVER_CACHE, _T("Stopping connection clean up timer"));
ms_connCloseTimer->Stop();
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -b -u -2 -r1.107 -r1.108
--- MailFolderCmn.cpp 8 Sep 2002 19:23:11 -0000 1.107
+++ MailFolderCmn.cpp 12 Sep 2002 02:36:51 -0000 1.108
@@ -147,5 +147,5 @@
#if 0
wxLogTrace(TRACE_MF_CLOSE,
- "Checking if '%s' expired: exp time: %s, now: %s",
+ _T("Checking if '%s' expired: exp time: %s, now: %s"),
m_mf->GetName().c_str(),
m_dt.FormatTime().c_str(),
@@ -323,5 +323,5 @@
{
wxLogTrace(TRACE_MF_CLOSE,
- "Delaying closing of '%s' (%d refs) for %d seconds.",
+ _T("Delaying closing of '%s' (%d refs) for %d seconds."),
mf->GetName().c_str(),
mf->GetNRef(),
@@ -342,5 +342,5 @@
MfCloseEntry::~MfCloseEntry()
{
- wxLogTrace(TRACE_MF_CLOSE, "Destroying MfCloseEntry(%s) (%d refs left)",
+ wxLogTrace(TRACE_MF_CLOSE, _T("Destroying MfCloseEntry(%s) (%d refs left)"),
m_mf->GetName().c_str(), m_mf->GetNRef());
@@ -385,5 +385,5 @@
CHECK_RET( delay > 0, _T("folder close timeout must be positive") );
- wxLogTrace(TRACE_MF_REF, "Adding '%s' to gs_MailFolderCloser",
+ wxLogTrace(TRACE_MF_REF, _T("Adding '%s' to gs_MailFolderCloser"),
mf->GetName().c_str());
@@ -407,5 +407,5 @@
{
#ifdef DEBUG
- wxLogTrace(TRACE_MF_CLOSE, "Going to remove '%s' from m_MfList",
+ wxLogTrace(TRACE_MF_CLOSE, _T("Going to remove '%s' from m_MfList"),
i->GetName().c_str());
#endif // DEBUG
@@ -430,5 +430,5 @@
#ifdef DEBUG
- wxLogTrace(TRACE_MF_REF, "Removing '%s' from gs_MailFolderCloser",
+ wxLogTrace(TRACE_MF_REF, _T("Removing '%s' from gs_MailFolderCloser"),
entry->GetName().c_str());
#endif // DEBUG
@@ -556,5 +556,5 @@
MailFolderCmn::IncRef()
{
- wxLogTrace(TRACE_MF_REF, "MF(%s)::IncRef(): %u -> %u",
+ wxLogTrace(TRACE_MF_REF, _T("MF(%s)::IncRef(): %u -> %u"),
GetName().c_str(), GetNRef(), GetNRef() + 1);
@@ -578,5 +578,5 @@
MailFolderCmn::RealDecRef()
{
- wxLogTrace(TRACE_MF_REF, "MF(%s)::DecRef(): %u -> %u",
+ wxLogTrace(TRACE_MF_REF, _T("MF(%s)::DecRef(): %u -> %u"),
GetName().c_str(), GetNRef(), GetNRef() - 1);
@@ -1352,5 +1352,5 @@
return;
- wxLogTrace(TRACE_MF_EVENTS, "Sending FolderUpdate event for folder '%s'",
+ wxLogTrace(TRACE_MF_EVENTS, _T("Sending FolderUpdate event for folder '%s'"),
GetName().c_str());
@@ -1597,5 +1597,5 @@
CHECK( filterRule, false, _T("FilterNewMail: NULL filter") );
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::FilterNewMail(%u msgs)",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::FilterNewMail(%u msgs)"),
GetName().c_str(), uidsNew.GetCount());
@@ -1638,5 +1638,5 @@
// some messages could have been deleted by filters
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::FilterNewMail(): %u msgs left",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::FilterNewMail(): %u msgs left"),
GetName().c_str(), uidsNew.GetCount());
@@ -1818,5 +1818,5 @@
const MFolder *folderDst)
{
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::ProcessNewMail(%u msgs) for %s",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::ProcessNewMail(%u msgs) for %s"),
GetName().c_str(),
uidsNew.GetCount(),
@@ -1871,5 +1871,5 @@
bool move = READ_CONFIG_BOOL(GetProfile(), MP_MOVE_NEWMAIL);
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::CollectNewMail(%u msgs) (%s)",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::CollectNewMail(%u msgs) (%s)"),
GetName().c_str(),
uidsNew.GetCount(),
@@ -1928,5 +1928,5 @@
countNew = uidsNew->GetCount();
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::ReportNewMail(%u msgs) (folder is %s)",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::ReportNewMail(%u msgs) (folder is %s)"),
folder->GetFullName().c_str(),
(unsigned int)countNew,
@@ -1940,5 +1940,5 @@
if ( !command.empty() )
{
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::ReportNewMail(): running '%s'",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::ReportNewMail(): running '%s'"),
folder->GetFullName().c_str(), command.c_str());
@@ -1981,5 +1981,5 @@
String command = wxFileType::ExpandCommand(soundCmd, params);
- wxLogTrace(TRACE_MF_NEWMAIL, "MF(%s)::ReportNewMail(): playing '%s'",
+ wxLogTrace(TRACE_MF_NEWMAIL, _T("MF(%s)::ReportNewMail(): playing '%s'"),
folder->GetFullName().c_str(), command.c_str());
@@ -2071,5 +2071,5 @@
{
// this may happen if another session deleted it
- wxLogDebug("New message %lu disappeared from folder '%s'",
+ wxLogDebug(_T("New message %lu disappeared from folder '%s'"),
uidsNew->Item(i),
folder->GetFullName().c_str());
@@ -2181,5 +2181,5 @@
(wasDeleted || !msgStatusOld.what) ) \
{ \
- wxLogTrace(M_TRACE_MFSTATUS, "%s: " #what "++ (now %lu)", \
+ wxLogTrace(M_TRACE_MFSTATUS, _T("%s: " #what "++ (now %lu)"), \
GetName().c_str(), status.what + 1); \
status.what++; \
@@ -2189,5 +2189,5 @@
if ( status.what > 0 ) \
{ \
- wxLogTrace(M_TRACE_MFSTATUS, "%s: " #what "-- (now %lu)", \
+ wxLogTrace(M_TRACE_MFSTATUS, _T("%s: " #what "-- (now %lu)"), \
GetName().c_str(), status.what - 1); \
status.what--; \
@@ -2210,5 +2210,5 @@
// next notify everyone else about the status change
wxLogTrace(TRACE_MF_EVENTS,
- "Sending MsgStatus event for %u msgs in folder '%s'",
+ _T("Sending MsgStatus event for %u msgs in folder '%s'"),
m_statusChangeData->msgnos.GetCount(), GetName().c_str());
@@ -2262,5 +2262,5 @@
// tell GUI to update
- wxLogTrace(TRACE_MF_EVENTS, "Sending FolderExpunged event for folder '%s'",
+ wxLogTrace(TRACE_MF_EVENTS, _T("Sending FolderExpunged event for folder '%s'"),
GetName().c_str());
Index: MailMH.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailMH.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- MailMH.cpp 8 Sep 2002 19:23:11 -0000 1.8
+++ MailMH.cpp 12 Sep 2002 02:36:51 -0000 1.9
@@ -157,5 +157,5 @@
else
{
- wxLogDebug("Folder specification '%s' unexpected.", spec.c_str());
+ wxLogDebug(_T("Folder specification '%s' unexpected."), spec.c_str());
}
}
Index: Message.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Message.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -2 -r1.31 -r1.32
--- Message.cpp 8 Sep 2002 19:23:11 -0000 1.31
+++ Message.cpp 12 Sep 2002 02:36:51 -0000 1.32
@@ -108,5 +108,5 @@
if ( !addr )
{
- wxLogDebug("Invalid address '%s'", address.c_str());
+ wxLogDebug(_T("Invalid address '%s'"), address.c_str());
email->clear();
Index: MessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MessageCC.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -b -u -2 -r1.136 -r1.137
--- MessageCC.cpp 11 Sep 2002 23:59:39 -0000 1.136
+++ MessageCC.cpp 12 Sep 2002 02:36:51 -0000 1.137
@@ -746,5 +746,5 @@
// this is not fatal but not expected neither - I don't know if it
// can ever happen, in fact
- wxLogDebug("Embedded message/rfc822 without body structure?");
+ wxLogDebug(_T("Embedded message/rfc822 without body structure?"));
}
}
Index: Pop3.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Pop3.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- Pop3.cpp 8 Sep 2002 19:23:11 -0000 1.3
+++ Pop3.cpp 12 Sep 2002 02:36:51 -0000 1.4
@@ -279,5 +279,5 @@
if ( !ok )
{
- wxLogDebug("Unexpected line in UIDL response (%s) skipped.", t);
+ wxLogDebug(_T("Unexpected line in UIDL response (%s) skipped."), t);
uidl.clear();
Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -b -u -2 -r1.199 -r1.200
--- SendMessageCC.cpp 8 Sep 2002 19:23:11 -0000 1.199
+++ SendMessageCC.cpp 12 Sep 2002 02:36:51 -0000 1.200
@@ -1333,5 +1333,5 @@
{
// although not fatal, this shouldn't happen
- wxLogDebug("Multiple CHARSET parameters!");
+ wxLogDebug(_T("Multiple CHARSET parameters!"));
}
@@ -1459,5 +1459,5 @@
i++ )
{
- wxLogTrace(TRACE_SEND, "FCCing message to %s", (*i)->c_str());
+ wxLogTrace(TRACE_SEND, _T("FCCing message to %s"), (*i)->c_str());
WriteToFolder(**i);
@@ -1590,5 +1590,5 @@
{
case Prot_SMTP:
- wxLogTrace(TRACE_SEND, "Trying to open connection to SMTP server '%s'",
+ wxLogTrace(TRACE_SEND, _T("Trying to open connection to SMTP server '%s'"),
m_ServerHost.c_str());
if ( READ_CONFIG(m_profile, MP_SMTP_USE_8BIT) )
@@ -1605,5 +1605,5 @@
case Prot_NNTP:
- wxLogTrace(TRACE_SEND, "Trying to open connection to NNTP server '%s'",
+ wxLogTrace(TRACE_SEND, _T("Trying to open connection to NNTP server '%s'"),
m_ServerHost.c_str());
Index: ThreadJWZ.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/ThreadJWZ.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- ThreadJWZ.cpp 8 Sep 2002 19:23:11 -0000 1.25
+++ ThreadJWZ.cpp 12 Sep 2002 02:36:51 -0000 1.26
@@ -1206,8 +1206,8 @@
thr->setThreadable(thr->getChild()->getThreadable()->makeDummy());
- wxLogTrace(TRACE_JWZ, "Entering BreakThreads");
+ wxLogTrace(TRACE_JWZ, _T("Entering BreakThreads"));
if (m_breakThreadsOnSubjectChange)
breakThreads(m_root);
- wxLogTrace(TRACE_JWZ, "Leaving BreakThreads");
+ wxLogTrace(TRACE_JWZ, _T("Leaving BreakThreads"));
// If asked to, gather all the messages that have the same
@@ -1383,5 +1383,5 @@
void Threader::findRootSet()
{
- wxLogTrace(TRACE_JWZ, "Entering Threader::findRootSet()");
+ wxLogTrace(TRACE_JWZ, _T("Entering Threader::findRootSet()"));
m_root = new ThreadContainer();
HASHENT *ent;
@@ -1494,5 +1494,5 @@
void Threader::gatherSubjects()
{
- wxLogTrace(TRACE_JWZ, "Entering GatherSubjects");
+ wxLogTrace(TRACE_JWZ, _T("Entering GatherSubjects"));
size_t count = 0;
ThreadContainer *c = m_root->getChild();
@@ -1505,8 +1505,8 @@
HASHTAB *subjectTable = create(count*2);
- wxLogTrace(TRACE_JWZ, "Entering collectSubjects");
+ wxLogTrace(TRACE_JWZ, _T("Entering collectSubjects"));
// Collect the subjects in all the tree
count = collectSubjects(subjectTable, m_root, true);
- wxLogTrace(TRACE_JWZ, "Leaving collectSubjects");
+ wxLogTrace(TRACE_JWZ, _T("Leaving collectSubjects"));
if (count == 0) // If the table is empty, we're done.
@@ -1679,5 +1679,5 @@
destroy(&subjectTable);
- wxLogTrace(TRACE_JWZ, "Leaving GatherSubjects");
+ wxLogTrace(TRACE_JWZ, _T("Leaving GatherSubjects"));
}
@@ -1838,5 +1838,5 @@
static Threadable *BuildThreadableList(const HeaderInfoList *hilp)
{
- wxLogTrace(TRACE_JWZ, "Entering BuildThreadableList");
+ wxLogTrace(TRACE_JWZ, _T("Entering BuildThreadableList"));
Threadable *root = 0;
size_t count = hilp->Count();
@@ -1847,5 +1847,5 @@
root = item;
}
- wxLogTrace(TRACE_JWZ, "Leaving BuildThreadableList");
+ wxLogTrace(TRACE_JWZ, _T("Leaving BuildThreadableList"));
return root;
}
@@ -1927,5 +1927,5 @@
ThreadData *thrData)
{
- wxLogTrace(TRACE_JWZ, "Entering JWZThreadMessages");
+ wxLogTrace(TRACE_JWZ, _T("Entering JWZThreadMessages"));
Threadable *threadableRoot = BuildThreadableList(hilp);
@@ -1946,5 +1946,5 @@
delete threader;
- wxLogTrace(TRACE_JWZ, "Leaving JWZThreadMessages");
+ wxLogTrace(TRACE_JWZ, _T("Leaving JWZThreadMessages"));
}
-------------------------------------------------------
In remembrance
www.osdn.com/911/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
