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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdepim/kmail
From:       David Faure <faure () kde ! org>
Date:       2004-02-09 11:51:52
Message-ID: 20040209115152.BC6679672 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

<wheels> dfaure : backport?
<dfaure> grmmbl ok :)
(don't activate reader window on kmail --check)


  M +7 -2      kmkernel.cpp   1.235.2.1
  M +3 -1      kmkernel.h   1.89.2.1


--- kdepim/kmail/kmkernel.cpp  #1.235:1.235.2.1
@@ -269,5 +269,5 @@ void KMKernel::checkAccount (const QStri
 }
 
-void KMKernel::openReader()
+void KMKernel::openReader( bool onlyCheck )
 {
   KMMainWin *mWin = 0;
@@ -281,11 +281,15 @@ void KMKernel::openReader()
         break;
 
+  bool activate;
   if (ktmw) {
     mWin = (KMMainWin *) ktmw;
+    activate = !onlyCheck; // existing window: only activate if not --check
   }
   else {
     mWin = new KMMainWin;
+    activate = true; // new window: always activate
   }
 
+  if ( activate ) {
   mWin->show();
   // Activate window - doing this instead of KWin::activateWindow(mWin->winId());
@@ -294,4 +298,5 @@ void KMKernel::openReader()
   KStartupInfo::setNewStartupId( mWin, kapp->startupId() );
 #endif
+  }
 }
 
@@ -1397,5 +1402,5 @@ void KMKernel::action(bool mailto, bool 
     openComposer (to, cc, bcc, subj, body, 0, messageFile, attachURLs);
   else
-    openReader();
+    openReader( check );
 
   if (check)

--- kdepim/kmail/kmkernel.h  #1.89:1.89.2.1
@@ -105,5 +105,5 @@ public:
   int sendCertificate( const QString& to, const QByteArray& certData );
 
-  void openReader();
+  void openReader() { openReader( false ); }
   void compactAllFolders();
   int dcopAddMessage(const QString & foldername, const QString & messageFile);
@@ -259,4 +259,6 @@ signals:
 
 private:
+  void openReader( bool onlyCheck );
+
   KMFolder *the_inboxFolder;
   KMFolder *the_outboxFolder;


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