Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv17804/src/classes
Modified Files:
MessageView.cpp
Log Message:
user encoding should be used as fallback, not override the one specified in the message
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -b -u -2 -r1.134 -r1.135
--- MessageView.cpp 30 Sep 2003 23:00:58 -0000 1.134
+++ MessageView.cpp 3 Oct 2003 22:17:00 -0000 1.135
@@ -1559,11 +1559,6 @@
{
// get the encoding of the text
- wxFontEncoding encPart;
- if ( m_encodingUser != wxFONTENCODING_DEFAULT )
- {
- // user-specified encoding overrides everything
- encPart = m_encodingUser;
- }
- else if ( READ_CONFIG(GetProfile(), MP_MSGVIEW_AUTO_ENCODING) )
+ wxFontEncoding encPart = wxFONTENCODING_SYSTEM;
+ if ( READ_CONFIG(GetProfile(), MP_MSGVIEW_AUTO_ENCODING) )
{
encPart = textEnc;
@@ -1589,8 +1584,13 @@
}
}
- else
+
+ if ( encPart == wxFONTENCODING_SYSTEM )
{
- // autodetecting encoding is disabled, don't use any
- encPart = wxFONTENCODING_SYSTEM;
+ // autodetecting encoding is disabled or didn't work, use the users fall
+ // back encoding, if any
+ if ( m_encodingUser != wxFONTENCODING_DEFAULT )
+ {
+ encPart = m_encodingUser;
+ }
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
