Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv3800/src/modules
Modified Files:
Filters.cpp HtmlViewer.cpp NetscapeImporter.cpp PineImport.cpp
XFMailImport.cpp
Log Message:
more Unicode fixes
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -b -u -2 -r1.132 -r1.133
--- Filters.cpp 11 Sep 2002 22:57:53 -0000 1.132
+++ Filters.cpp 12 Sep 2002 02:36:51 -0000 1.133
@@ -2873,6 +2873,5 @@
{
// maybe another session deleted it?
- wxLogDebug("Filter error: message with UID %ld in folder '%s'"
- "doesn't exist any more.",
+ wxLogDebug(_T("Filter error: message with UID %ld in folder '%s' doesn't
+exist any more."),
m_MessageUId, m_MailFolder->GetName().c_str());
continue;
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -u -2 -r1.39 -r1.40
--- HtmlViewer.cpp 8 Sep 2002 19:23:12 -0000 1.39
+++ HtmlViewer.cpp 12 Sep 2002 02:36:51 -0000 1.40
@@ -911,5 +911,5 @@
// makes cut-&-pasting into Netscape easier
- //wxLogTrace("html", "Generated HTML output:\n%s\n", m_htmlText.c_str());
+ //wxLogTrace(_T("html"), _T("Generated HTML output:\n%s\n"), m_htmlText.c_str());
m_window->SetPage(m_htmlText);
Index: NetscapeImporter.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/NetscapeImporter.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- NetscapeImporter.cpp 5 Sep 2001 00:53:36 -0000 1.10
+++ NetscapeImporter.cpp 12 Sep 2002 02:36:51 -0000 1.11
@@ -1084,5 +1084,5 @@
if ( nEq == wxNOT_FOUND )
{
- wxLogDebug("%s(%u): missing variable identifier ('%s').", filename.c_str(),
nLine + 1,g_VarIdent.c_str());
+ wxLogDebug(_T("%s(%u): missing variable identifier ('%s')."),
+filename.c_str(), nLine + 1,g_VarIdent.c_str());
// skip line
Index: PineImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/PineImport.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- PineImport.cpp 24 Aug 2001 14:36:48 -0000 1.9
+++ PineImport.cpp 12 Sep 2002 02:36:51 -0000 1.10
@@ -260,5 +260,5 @@
else
{
- wxLogDebug(".pinerc(%u): non numeric composer-wrap-column value.",
+ wxLogDebug(_T(".pinerc(%u): non numeric composer-wrap-column value."),
line);
}
@@ -286,5 +286,5 @@
else
{
- wxLogDebug(".pinerc(%u): non numeric mail-check-interval value.",
+ wxLogDebug(_T(".pinerc(%u): non numeric mail-check-interval value."),
line);
}
@@ -365,5 +365,5 @@
if ( nEq == wxNOT_FOUND )
{
- wxLogDebug("%s(%u): missing '=' sign.", filename.c_str(), nLine + 1);
+ wxLogDebug(_T("%s(%u): missing '=' sign."), filename.c_str(), nLine + 1);
// skip line
Index: XFMailImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/XFMailImport.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- XFMailImport.cpp 19 Dec 2001 12:34:43 -0000 1.20
+++ XFMailImport.cpp 12 Sep 2002 02:36:51 -0000 1.21
@@ -173,6 +173,6 @@
if ( nEq == wxNOT_FOUND )
{
- wxLogTrace("importxfmail",
- "%s(%u): missing '=' sign.", filename.c_str(), nLine + 1);
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): missing '=' sign."), filename.c_str(), nLine + 1);
// skip line
@@ -219,6 +219,6 @@
if ( nEq == wxNOT_FOUND )
{
- wxLogTrace("importxfmail",
- "%s(%u): missing '=' sign.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): missing '=' sign."),
filenamerc.c_str(), nLine + 1);
@@ -263,6 +263,6 @@
if ( !folderName )
{
- wxLogTrace("importxfmail",
- "%s(%u): empty folder name, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): empty folder name, skipping."),
foldersfilename.c_str(), nLine + 1);
continue;
@@ -282,6 +282,6 @@
if ( folderName[0u] == '/' )
{
- wxLogTrace("importxfmail",
- "%s(%u): folder '%s' assumed to be a spool, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): folder '%s' assumed to be a spool, skipping."),
foldersfilename.c_str(), nLine + 1, folderName.c_str());
continue;
@@ -306,6 +306,6 @@
if ( !typeString.ToULong(&nType) || (nType != 1 && nType != 8) )
{
- wxLogTrace("importxfmail",
- "%s(%u): unrecognized folder type %s, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): unrecognized folder type %s, skipping."),
foldersfilename.c_str(), nLine + 1, typeString.c_str());
continue;
@@ -349,6 +349,6 @@
if ( !flagsString.ToULong(&flags) )
{
- wxLogTrace("importxfmail",
- "%s(%u): not numeric folder flags %s, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): not numeric folder flags %s, skipping."),
foldersfilename.c_str(), nLine + 1, flagsString.c_str());
continue;
@@ -365,6 +365,6 @@
folderName == "template" )
{
- wxLogTrace("importxfmail",
- "%s(%u): folder %s is a system folder.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): folder %s is a system folder."),
foldersfilename.c_str(), nLine + 1, folderName.c_str());
@@ -372,5 +372,5 @@
if ( !(flagsImport & ImportFolder_SystemImport) )
{
- wxLogTrace("importxfmail", "Skipping XFMail system folder.");
+ wxLogTrace(_T("importxfmail"), _T("Skipping XFMail system folder."));
continue;
@@ -586,6 +586,6 @@
if ( *p++ != '@' )
{
- wxLogTrace("importxfmail",
- "%s(%u): rule line doesn't start with '@', skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): rule line doesn't start with '@', skipping."),
filename.c_str(), nLine + 1);
@@ -597,6 +597,6 @@
if ( tk.CountTokens() != 5 )
{
- wxLogTrace("importxfmail",
- "%s(%u): rule line doesn't contain exactly 5 tokens, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): rule line doesn't contain exactly 5 tokens,
+skipping."),
filename.c_str(), nLine + 1);
@@ -609,6 +609,6 @@
!tk.GetNextToken().ToULong(&flags) )
{
- wxLogTrace("importxfmail",
- "%s(%u): non numeric rule action or flags, skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): non numeric rule action or flags, skipping."),
filename.c_str(), nLine + 1);
@@ -648,6 +648,6 @@
if ( where == ORC_W_Illegal )
{
- wxLogTrace("importxfmail",
- "%s(%u): unrecognized rule header '%s', skipping.",
+ wxLogTrace(_T("importxfmail"),
+ _T("%s(%u): unrecognized rule header '%s', skipping."),
filename.c_str(), nLine + 1, fmatch.c_str());
-------------------------------------------------------
In remembrance
www.osdn.com/911/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
