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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/kmail
From:       Laurent Montel <montel () kde ! org>
Date:       2009-09-28 18:04:24
Message-ID: 1254161064.753741.19765.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1028993 by mlaurent:

comment other code


 M  +3 -6      kmreaderwin.cpp  
 M  +1 -2      kmreaderwin.h  


--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.cpp #1028992:1028993
@@ -1373,9 +1373,9 @@
   }
 
   if (aMsg) {
-#ifndef USE_AKONADI_VIEWER	  
+#ifndef USE_AKONADI_VIEWER
     aMsg->setOverrideCodec( overrideCodec() );
-#endif    
+#endif
     aMsg->setDecodeHTML( htmlMail() );
     mLastStatus = aMsg->status();
     // FIXME: workaround to disable DND for IMAP load-on-demand
@@ -1935,20 +1935,17 @@
   connect( mPartHtmlWriter, SIGNAL( finished() ), this, SLOT( slotPrintMsg() ) );
   setMsg( aMsg, true );
 }
-#endif
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotPrintMsg()
 {
-#ifndef USE_AKONADI_VIEWER
   disconnect( mPartHtmlWriter, SIGNAL( finished() ), this, SLOT( slotPrintMsg() ) );
   if (!message()) return;
   mViewer->view()->print();
   deleteLater();
-#endif
 }
+#endif
 
-
 //-----------------------------------------------------------------------------
 int KMReaderWin::msgPartFromUrl( const KUrl &aUrl )
 {
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.h #1028992:1028993
@@ -509,13 +509,12 @@
   void slotAtmView( int id, const QString& name );
 #ifndef USE_AKONADI_VIEWER
   void slotDelayedResize();
-#endif
   /** Print message. Called on as a response of finished() signal of mPartHtmlWriter
       after rendering is finished.
       In the very end it deletes the KMReaderWin window that was created
       for the purpose of rendering. */
   void slotPrintMsg();
-
+#endif
 protected:
   /** reimplemented in order to update the frame width in case of a changed
       GUI style */
[prev in list] [next in list] [prev in thread] [next in thread]