Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3447/classes
Modified Files:
MApplication.cpp MessageView.cpp
Log Message:
unicode fixes
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -b -u -2 -r1.293 -r1.294
--- MApplication.cpp 21 Apr 2004 16:13:39 -0000 1.293
+++ MApplication.cpp 18 Jun 2004 01:52:41 -0000 1.294
@@ -283,7 +283,7 @@
{
String foldersToReopen = READ_APPCONFIG(MP_OPENFOLDERS);
- char *folders = strutil_strdup(wxConvertWX2MB(foldersToReopen));
+ wxChar *folders = strutil_strdup(foldersToReopen);
kbStringList openFoldersList;
- strutil_tokenise(folders, ";", openFoldersList);
+ strutil_tokenise(folders, _T(";"), openFoldersList);
delete [] folders;
@@ -1067,5 +1067,5 @@
// we want just the DESTDIR, not DESTDIR/share/mahogany, so
// truncate (-1 for slash)
- m_globalDir.resize(m_globalDir.length() - strlen(MAHOGANY_DATADIR) - 1);
+ m_globalDir.resize(m_globalDir.length() - wxStrlen(MAHOGANY_DATADIR) - 1);
}
#elif defined(OS_WIN)
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -b -u -2 -r1.149 -r1.150
--- MessageView.cpp 16 Mar 2004 00:00:58 -0000 1.149
+++ MessageView.cpp 18 Jun 2004 01:52:41 -0000 1.150
@@ -2522,6 +2522,6 @@
kbStringList faxdomains;
String faxListing = READ_CONFIG(profile, MP_INCFAX_DOMAINS);
- char *faxlisting = strutil_strdup(wxConvertWX2MB(faxListing));
- strutil_tokenise(faxlisting, ":;,", faxdomains);
+ wxChar *faxlisting = strutil_strdup(faxListing);
+ strutil_tokenise(faxlisting, _T(":;,"), faxdomains);
delete [] faxlisting;
-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
