[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-29 11:52:30
Message-ID: 1254225150.807329.2558.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029273 by mlaurent:

Remove other code


 M  +0 -3      kmmessage.h  
 M  +6 -0      kmreaderwin.cpp  
 M  +1 -1      kmreaderwin.h  


--- branches/work/akonadi-ports/kdepim/kmail/kmmessage.h #1029272:1029273
@@ -48,10 +48,7 @@
   }
 }
 
-namespace KMail {
-}
 
-
 // Real code starts here :)
 
 namespace KMail {
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.cpp #1029272:1029273
@@ -535,7 +535,9 @@
   mLastSerNum = 0;
   mWaitingForSerNum = 0;
   mMessage = 0;
+#ifndef USE_AKONADI_VIEWER
   mLastStatus.clear();
+#endif
   mMsgDisplay = true;
   mPrinting = false;
   mAtmUpdate = false;
@@ -1378,7 +1380,9 @@
     aMsg->setOverrideCodec( overrideCodec() );
 #endif
     aMsg->setDecodeHTML( htmlMail() );
+#ifndef USE_AKONADI_VIEWER
     mLastStatus = aMsg->status();
+#endif
     // FIXME: workaround to disable DND for IMAP load-on-demand
 #ifndef USE_AKONADI_VIEWER
     if ( !aMsg->isComplete() )
@@ -1387,7 +1391,9 @@
       mViewer->setDNDEnabled( true );
 #endif
   } else {
+#ifndef USE_AKONADI_VIEWER
     mLastStatus.clear();
+#endif
   }
 
   // only display the msg if it is complete
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.h #1029272:1029273
@@ -632,8 +632,8 @@
   bool mMsgDisplay;
   bool mNoMDNsWhenEncrypted;
   unsigned long mLastSerNum;
+#ifndef USE_AKONADI_VIEWER
   MessageStatus mLastStatus;
-#ifndef USE_AKONADI_VIEWER
   Message::CSSHelper * mCSSHelper;
   bool mUseFixedFont;
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]