[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kdepim/kmail
From:       Ingo Klöcker <kloecker () kde ! org>
Date:       2005-03-21 23:43:13
Message-ID: 20050321234313.2186F5FE () office ! kde ! org
[Download RAW message or body]

CVS commit by kloecker: 

Backport CVS commit by tilladam: 

Don't hardcode the use of the network codec when opening a mail from
a file but rather use the one the mail specifies or the fallback encoding.

CCBUG: 100834


  M +5 -3      kmcommands.cpp   1.197.2.1
  M +3 -1      kmcommands.h   1.61.2.1
  M +1 -1      kmmainwidget.cpp   1.320.2.2


--- kdepim/kmail/kmcommands.cpp  #1.197:1.197.2.1
@@ -868,7 +868,9 @@ void KMSaveMsgCommand::slotSaveResult(KI
 //-----------------------------------------------------------------------------
 
-KMOpenMsgCommand::KMOpenMsgCommand( QWidget *parent, const KURL & url )
+KMOpenMsgCommand::KMOpenMsgCommand( QWidget *parent, const KURL & url,
+                                    const QTextCodec *codec )
   : KMCommand( parent ),
-    mUrl( url )
+    mUrl( url ),
+    mCodec( codec )
 {
   setDeletesItself( true );
@@ -959,5 +961,5 @@ void KMOpenMsgCommand::slotResult( KIO::
     msg->setReadyToShow( true );
     KMReaderMainWin *win = new KMReaderMainWin();
-    win->showMsg( kmkernel->networkCodec(), msg );
+    win->showMsg( mCodec, msg );
     win->show();
     if ( multipleMessages )

--- kdepim/kmail/kmcommands.h  #1.61:1.61.2.1
@@ -332,5 +332,6 @@ class KDE_EXPORT KMOpenMsgCommand : publ
 
 public:
-  KMOpenMsgCommand( QWidget *parent, const KURL & url = KURL() );
+  KMOpenMsgCommand( QWidget *parent, const KURL & url = KURL(), 
+                    const QTextCodec *codec = 0 );
 
 private:
@@ -346,4 +347,5 @@ private:
   DwString mMsgString;
   KIO::TransferJob *mJob;
+  const QTextCodec *mCodec;
 };
 

--- kdepim/kmail/kmmainwidget.cpp  #1.320.2.1:1.320.2.2
@@ -1587,5 +1587,5 @@ void KMMainWidget::slotSaveMsg()
 void KMMainWidget::slotOpenMsg()
 {
-  KMOpenMsgCommand *openCommand = new KMOpenMsgCommand( this );
+  KMOpenMsgCommand *openCommand = new KMOpenMsgCommand( this, 0, mCodec );
 
   openCommand->start();


[prev in list] [next in list] [prev in thread] [next in thread]