Revision: 7331
http://mahogany.svn.sourceforge.net/mahogany/?rev=7331&view=rev
Author: vadz
Date: 2007-08-21 14:37:58 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
don't use wxConvertMB2WX for the envelope fields which have no reason to be in
current locale encoding
Modified Paths:
--------------
trunk/M/src/mail/MailFolderCC.cpp
Modified: trunk/M/src/mail/MailFolderCC.cpp
===================================================================
--- trunk/M/src/mail/MailFolderCC.cpp 2007-08-21 21:36:15 UTC (rev 7330)
+++ trunk/M/src/mail/MailFolderCC.cpp 2007-08-21 21:37:58 UTC (rev 7331)
@@ -4182,7 +4182,7 @@
MFolderType folderType = GetType();
if ( folderType == MF_NNTP || folderType == MF_NEWS )
{
- entry.m_NewsGroups = wxConvertMB2WX(env->newsgroups);
+ entry.m_NewsGroups = env->newsgroups;
}
else
{
@@ -4211,21 +4211,27 @@
}
// subject
-
- entry.m_Subject = MIME::DecodeHeader(wxConvertMB2WX(env->subject),
&encoding);
- if ( (encoding != wxFONTENCODING_SYSTEM) &&
- (encoding != encodingMsg) )
+ entry.m_Subject = MIME::DecodeHeader(wxString::From8BitData(env->subject),
+ &encoding);
+ if ( (encoding != wxFONTENCODING_SYSTEM) && (encoding != encodingMsg) )
{
if ( encodingMsg == wxFONTENCODING_SYSTEM )
encodingMsg = encoding;
+#if !wxUSE_UNICODE
+ else
+ {
+ wxLogDebug("Different encodings used for the headers of the same "
+ "message, some headers don't be displayed correctly");
+ }
+#endif // !wxUSE_UNICODE
}
// all the other fields
entry.m_Size = elt->rfc822_size;
entry.m_Lines = 0; // TODO: calculate them?
- entry.m_Id = wxConvertMB2WX(env->message_id);
- entry.m_References = wxConvertMB2WX(env->references);
- entry.m_InReplyTo = wxConvertMB2WX(env->in_reply_to);
+ entry.m_Id = env->message_id;
+ entry.m_References = env->references;
+ entry.m_InReplyTo = env->in_reply_to;
entry.m_UId = mail_uid(m_MailStream, elt->msgno);
// set the font encoding to be used for displaying this entry
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
