openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r708131.diff of Package kdepim3 (Revision d6ae4198639c17de27c609f386a15236)

Currently displaying revision d6ae4198639c17de27c609f386a15236 , Show latest

------------------------------------------------------------------------
r708131 | bvirlet | 2007-09-03 23:54:52 +0200 (Mon, 03 Sep 2007) | 2 lines

Revert changes which most probably are the reasons of the bugs in kmail.

------------------------------------------------------------------------
--- kmail/kmacctlocal.cpp
+++ kmail/kmacctlocal.cpp
@@ -32,8 +32,7 @@ using KPIM::ProgressManager;
 KMAcctLocal::KMAcctLocal(AccountManager* aOwner, const QString& aAccountName, uint id):
   KMAccount(aOwner, aAccountName, id), mHasNewMail( false ),
   mAddedOk( true ), mNumMsgs( 0 ),
-  mMsgsFetched( 0 ), mMailFolder( 0 ),
-  mMboxStorage( 0 )
+  mMsgsFetched( 0 ), mMailFolder( 0 )
 {
   mLock = procmail_lockfile;
 }
@@ -76,14 +75,9 @@ void KMAcctLocal::processNewMail(bool)
 {
   mHasNewMail = false;
 
-  connect( this, SIGNAL(preProcessExited(bool)), SLOT(continueProcess(bool)) );
-  preProcess();
-}
-
-void KMAcctLocal::continueProcess( bool preProcessSuccess )
-{
-  if ( !preProcessSuccess )
+  if ( !preProcess() ) {
     return;
+  }
 
   QTime t;
   t.start();
@@ -104,36 +98,34 @@ void KMAcctLocal::continueProcess( bool 
 
 
 //-----------------------------------------------------------------------------
-void KMAcctLocal::preProcess()
+bool KMAcctLocal::preProcess()
 {
   if ( precommand().isEmpty() ) {
     QFileInfo fi( location() );
     if ( fi.size() == 0 ) {
       BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
-      emit preProcessExited( false );
-      return;
+      return false;
     }
   }
 
   mMailFolder = new KMFolder( 0, location(), KMFolderTypeMbox,
                               false /* no index */, false /* don't export sernums */ );
-  mMboxStorage =
+  KMFolderMbox* mboxStorage =
     static_cast<KMFolderMbox*>(mMailFolder->storage());
-  mMboxStorage->setLockType( mLock );
+  mboxStorage->setLockType( mLock );
   if ( mLock == procmail_lockfile)
-    mMboxStorage->setProcmailLockFileName( mProcmailLockFileName );
+    mboxStorage->setProcmailLockFileName( mProcmailLockFileName );
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
     BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
-    emit preProcessExited( false );
-    return;
+    return false;
   }
 
   //BroadcastStatus::instance()->reset();
   BroadcastStatus::instance()->setStatusMsg(
-	i18n("Preparing transmission from \"%1\"...").arg(mName));
+        i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -145,19 +137,13 @@ void KMAcctLocal::preProcess()
     false, // cannot be canceled
     false ); // no tls/ssl
 
- connect( this, SIGNAL(precommandExited(bool)), SLOT(continuePreProcess(bool)) );
- startPrecommand(precommand());
-}
-
-void KMAcctLocal::continuePreProcess( bool precommandSuccess )
-{
-  if ( !precommandSuccess )
+  // run the precommand
+  if (!runPrecommand(precommand()))
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
     BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." ));
-    emit preProcessExited( false );
-    return;
+    return false;
   }
 
   const int rc = mMailFolder->open("acctlocalMail");
@@ -170,18 +156,17 @@ void KMAcctLocal::continuePreProcess( bo
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
     BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
-    emit preProcessExited( false );
+    return false;
   }
 
-  if (!mMboxStorage->isLocked()) {
+  if (!mboxStorage->isLocked()) {
     kdDebug(5006) << "mailFolder could not be locked" << endl;
     mMailFolder->close("acctlocalMail");
     checkDone( mHasNewMail, CheckError );
     QString errMsg = i18n( "Transmission failed: Could not lock %1." )
       .arg( mMailFolder->location() );
     BroadcastStatus::instance()->setStatusMsg( errMsg );
-    emit preProcessExited( false );
-    return;
+    return false;
   }
 
   mFolder->open("acctlocalFold");
@@ -195,7 +180,7 @@ void KMAcctLocal::continuePreProcess( bo
     .arg(mMailFolder->location()).arg( mNumMsgs );
 
   //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true );
-  emit preProcessExited( true );
+  return true;
 }
 
 
@@ -335,5 +320,3 @@ void KMAcctLocal::setProcmailLockFileNam
 {
     mProcmailLockFileName = s;
 }
-
-#include "kmacctlocal.moc"
--- kmail/kmacctmaildir.cpp
+++ kmail/kmacctmaildir.cpp
@@ -79,6 +79,7 @@ void KMAcctMaildir::pseudoAssign( const 
 //-----------------------------------------------------------------------------
 void KMAcctMaildir::processNewMail(bool)
 {
+  QTime t;
   hasNewMail = false;
 
   if ( precommand().isEmpty() ) {
@@ -90,6 +91,15 @@ void KMAcctMaildir::processNewMail(bool)
     }
   }
 
+  KMFolder mailFolder(0, location(), KMFolderTypeMaildir,
+                              false /* no index */, false /* don't export sernums */);
+
+  long num = 0;
+  long i;
+  int rc;
+  KMMessage* msg;
+  bool addedOk;
+
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
     BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
@@ -109,23 +119,7 @@ void KMAcctMaildir::processNewMail(bool)
     false ); // no tls/ssl
 
   // run the precommand
-  connect( this, SIGNAL(precommandExited(bool)), SLOT(continueProcessNewMail(bool)) );
-  startPrecommand( precommand() );
-}
-
-void KMAcctMaildir::continueProcessNewMail( bool precommandSuccess )
-{
-  QTime t;
-  long num = 0;
-  long i;
-  int rc;
-  KMMessage* msg;
-  bool addedOk;
-
-  KMFolder mailFolder(0, location(), KMFolderTypeMaildir,
-                            false /* no index */, false /* don't export sernums */);
-
-  if ( !precommandSuccess )
+  if (!runPrecommand(precommand()))
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
@@ -238,6 +232,3 @@ void KMAcctMaildir::setLocation(const QS
 {
   mLocation = aLocation;
 }
-
-#include "kmacctmaildir.moc"
-
--- kmail/accountmanager.h
+++ kmail/accountmanager.h
@@ -97,6 +97,8 @@ public slots:
   void singleInvalidateIMAPFolders( KMAccount * );
 
   void intCheckMail( int, bool interactive = true );
+  /** Call processNextCheck with the false argument. **/
+  void slotProcessNextCheck();
   void processNextCheck( bool newMail );
 
   /** this slot increases the count of new mails to show a total number
--- kmail/kmaccount.h
+++ kmail/kmaccount.h
@@ -184,12 +184,12 @@ public:
   virtual void setPrecommand(const QString &cmd) { mPrecommand = cmd; }
 
   /**
-   * Start the precommand. If the precommand is empty, the method
+   * Runs the precommand. If the precommand is empty, the method
    * will just return success and not actually do anything
    *
-   * @return True if successful start, false otherwise
+   * @return True if successful, false otherwise
    */
-  void startPrecommand(const QString &precommand);
+  bool runPrecommand(const QString &precommand);
 
   /**
    * Very primitive en/de-cryption so that the password is not
@@ -216,7 +216,7 @@ public:
    * @return whether mail checks can proceed
    */
   virtual bool mailCheckCanProceed() const { return true; }
-
+  
   /**
    * Set/Get if this account is currently checking mail
    */
@@ -247,12 +247,6 @@ public:
 
 signals:
   /**
-   * Emitted after the precommand exited, successfully or not
-   * @param success true if the command execution was successful.
-   */
-  virtual void precommandExited( bool success );
-
-  /**
    * Emitted after the mail check is finished.
    * @param newMail true if there was new mail
    * @param status the status of the mail check
@@ -268,9 +262,7 @@ signals:
 protected slots:
   virtual void mailCheck();
   virtual void sendReceipts();
-
-private slots:
-  void precommandFinished( bool success );
+  virtual void precommandExited(bool);
 
 protected:
   KMAccount( AccountManager* owner, const QString& accountName, uint id);
@@ -313,6 +305,7 @@ protected:
   int mInterval;
   bool mExclude;
   bool mCheckingMail : 1;
+  bool mPrecommandSuccess;
   QValueList<KMMessage*> mReceipts;
   QPtrList<FolderJob>  mJobList;
   bool mHasInbox : 1;
@@ -327,7 +320,6 @@ private:
 private:
   // for detailed (per folder) new mail notification
   QMap<QString, int> mNewInFolder;
-  KMPrecommand *mPrecommandProcess;
 };
 
 #endif /*kmaccount_h*/
--- kmail/kmaccount.cpp
+++ kmail/kmaccount.cpp
@@ -88,9 +88,9 @@ KMAccount::KMAccount(AccountManager* aOw
     mInterval(0),
     mExclude(false),
     mCheckingMail(false),
+    mPrecommandSuccess(true),
     mHasInbox(false),
-    mMailCheckProgressItem(0),
-    mPrecommandProcess(0)
+    mMailCheckProgressItem(0)
 {
   assert(aOwner != 0);
 }
@@ -350,33 +350,35 @@ void KMAccount::deinstallTimer()
 }
 
 //-----------------------------------------------------------------------------
-void KMAccount::startPrecommand(const QString &precommand)
+bool KMAccount::runPrecommand(const QString &precommand)
 {
   // Run the pre command if there is one
-  if ( precommand.isEmpty() ) {
-    emit precommandExited( true );
-    return;
-  }
+  if ( precommand.isEmpty() )
+    return true;
 
-  KMPrecommand *mPrecommandProcess = new KMPrecommand(precommand, this);
+  KMPrecommand precommandProcess(precommand, this);
 
   BroadcastStatus::instance()->setStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
-  connect(mPrecommandProcess, SIGNAL(finished(bool)),
-          SLOT(precommandFinished(bool)));
+  connect(&precommandProcess, SIGNAL(finished(bool)),
+          SLOT(precommandExited(bool)));
 
   kdDebug(5006) << "Running precommand " << precommand << endl;
-  if (!mPrecommandProcess->start())
-    emit precommandExited( false );
+  if (!precommandProcess.start()) return false;
+
+  kapp->eventLoop()->enterLoop();
+
+  return mPrecommandSuccess;
 }
+
 //-----------------------------------------------------------------------------
-void KMAccount::precommandFinished( bool success )
+void KMAccount::precommandExited(bool success)
 {
-  delete mPrecommandProcess; mPrecommandProcess = 0;
-
-  emit precommandExited( success );
+  mPrecommandSuccess = success;
+  kapp->eventLoop()->exitLoop();
 }
+
 //-----------------------------------------------------------------------------
 void KMAccount::mailCheck()
 {
--- kmail/popaccount.h
+++ kmail/popaccount.h
@@ -45,7 +45,7 @@ public:
    */
   bool usePipelining(void) const { return mUsePipelining; }
   virtual void setUsePipelining(bool);
-
+ 
   /**
    * Shall messages be left on the server upon retreival (TRUE)
    * or deleted (FALSE).
@@ -171,11 +171,6 @@ protected:
 
 protected slots:
   /**
-   * Continue the job after precommand was executed
-   */
-  void continueJob( bool precommandSuccess );
-
-  /**
    * Messages are downloaded in the background and then once every x seconds
    * a batch of messages are processed. Messages are processed in batches to
    * reduce flicker (multiple refreshes of the qlistview of messages headers
--- kmail/popaccount.cpp
+++ kmail/popaccount.cpp
@@ -367,20 +367,14 @@ void PopAccount::slotAbortRequested()
 void PopAccount::startJob()
 {
   // Run the precommand
-  connect( this, SIGNAL(precommandExited(bool)), SLOT(continueJob(bool)) );
-  startPrecommand(precommand());
-}
-
-void PopAccount::continueJob( bool precommandSuccess )
-{
-  if ( !precommandSuccess )
-  {
-    KMessageBox::sorry(0,
-                       i18n("Could not execute precommand: %1").arg(precommand()),
-                       i18n("KMail Error Message"));
-    checkDone( false, CheckError );
-    return;
-  }
+  if (!runPrecommand(precommand()))
+    {
+      KMessageBox::sorry(0,
+                         i18n("Could not execute precommand: %1").arg(precommand()),
+                         i18n("KMail Error Message"));
+      checkDone( false, CheckError );
+      return;
+    }
   // end precommand code
 
   KURL url = getUrl();
--- kmail/accountmanager.cpp
+++ kmail/accountmanager.cpp
@@ -122,6 +122,11 @@ void AccountManager::singleCheckMail(KMA
     return;
   }
 
+  QTimer::singleShot(0, this, SLOT(slotProcessNextCheck()));
+}
+//-----------------------------------------------------------------------------
+void AccountManager::slotProcessNextCheck()
+{
   processNextCheck( false );
 }
 //-----------------------------------------------------------------------------
--- kmail/kmacctlocal.h
+++ kmail/kmacctlocal.h
@@ -7,12 +7,8 @@
 #include "kmaccount.h"
 #include "kmglobal.h"
 
-class KMFolderMbox;
-
 class KMAcctLocal: public KMAccount
 {
-  Q_OBJECT
-
 protected:
   friend class ::AccountManager;
 
@@ -41,14 +37,8 @@ public:
   virtual void readConfig(KConfig&);
   virtual void writeConfig(KConfig&);
 
-signals:
-  virtual void preProcessExited( bool preProcessSuccess );
-
 private slots:
-  void preProcess();
-  void continuePreProcess( bool preCommandSuccess );
-  void continueProcess( bool preProcessSuccess );
-
+  bool preProcess();
   bool fetchMsg();
   void postProcess();
 
@@ -62,8 +52,6 @@ private:
   int mMsgsFetched;
   KMFolder *mMailFolder;
   QString mStatusMsgStub;
-
-  KMFolderMbox* mMboxStorage; // used during preprocess
 };
 
 #endif /*kmacctlocal_h*/
--- kmail/kmsender.cpp
+++ kmail/kmsender.cpp
@@ -759,6 +759,7 @@ void KMSender::slotIdle()
   cleanup();
 }
 
+
 //-----------------------------------------------------------------------------
 void KMSender::slotPrecommandFinished(bool normalExit)
 {
--- kmail/kmacctmaildir.h
+++ kmail/kmacctmaildir.h
@@ -9,8 +9,6 @@
 
 class KMAcctMaildir: public KMAccount
 {
-  Q_OBJECT
-
 protected:
   friend class ::AccountManager;
 
@@ -31,9 +29,6 @@ public:
   virtual void readConfig(KConfig&);
   virtual void writeConfig(KConfig&);
 
-private slots:
-  void continueProcessNewMail( bool precommandSuccess );
-
 protected:
   QString mLocation;
   bool hasNewMail;

Places

File r708131.diff of Package kdepim3 (Revision d6ae4198639c17de27c609f386a15236)

Places