[M-CVS] CVS: M/src/modules HtmlViewer.cpp,1.33,1.34 TextViewer.cpp,1.27,1.28

[Nerijus Baliunas]

Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv21294/src/modules

Modified Files:
        HtmlViewer.cpp TextViewer.cpp 
Log Message:
removed UTF-8 parsing from viewers, as it started to work in MessageView.cpp after 
commenting out check for EnsureAvailableTextEncoding

Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- HtmlViewer.cpp      16 Apr 2002 19:15:34 -0000      1.33
+++ HtmlViewer.cpp      16 Apr 2002 19:32:15 -0000      1.34
@@ -726,9 +726,9 @@
 
 void HtmlViewer::ShowHeader(const String& headerName,
-                            const String& headerValueOrig,
+                            const String& headerValue,
                             wxFontEncoding encHeader)
 {
    // don't show empty headers at all
-   if ( headerValueOrig.empty() )
+   if ( headerValue.empty() )
       return;
 
@@ -741,5 +741,4 @@
    }
 
-   String headerValue = headerValueOrig;
    const ProfileValues& profileValues = GetOptions();
 
@@ -758,10 +757,4 @@
 
    {
-      if ( encHeader == wxFONTENCODING_UTF8 || encHeader == wxFONTENCODING_UTF7 )
-      {
-         // convert from UTF-8|7 to environment's default encoding
-         // FIXME it won't be needed when full Unicode support is available
-         encHeader = ConvertUnicodeToSystem(&headerValue, encHeader);
-      }
       FontColourChanger colChanger(profileValues.HeaderValueCol, m_htmlText);
 

Index: TextViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/TextViewer.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- TextViewer.cpp      16 Apr 2002 19:15:34 -0000      1.27
+++ TextViewer.cpp      16 Apr 2002 19:32:15 -0000      1.28
@@ -485,11 +485,10 @@
 
 void TextViewer::ShowHeader(const String& headerName,
-                            const String& headerValueOrig,
+                            const String& headerValue,
                             wxFontEncoding encHeader)
 {
-   if ( headerValueOrig.empty() )
+   if ( headerValue.empty() )
       return;
 
-   String headerValue = headerValueOrig;
    const ProfileValues& profileValues = GetOptions();
 
@@ -503,10 +502,4 @@
    if ( encHeader != wxFONTENCODING_SYSTEM )
    {
-      if ( encHeader == wxFONTENCODING_UTF8 || encHeader == wxFONTENCODING_UTF7 )
-      {
-         // convert from UTF-8|7 to environment's default encoding
-         // FIXME it won't be needed when full Unicode support is available
-         encHeader = ConvertUnicodeToSystem(&headerValue, encHeader);
-      }
       wxFont font = profileValues.GetFont(encHeader);
       attr.SetFont(font);


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates