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

List:       kde-commits
Subject:    [kdepim] mailcommon/collectionpage: Fix Bug 320098 - Expire settings not saved if you only click Ok
From:       Montel Laurent <montel () kde ! org>
Date:       2013-05-31 17:49:46
Message-ID: 20130531174946.646B9A6092 () git ! kde ! org
[Download RAW message or body]

Git commit 0cc0cd771b65d3ef1648dde98fb2a64fe8c52b1c by Montel Laurent.
Committed on 31/05/2013 at 19:10.
Pushed by mlaurent into branch 'master'.

Fix Bug 320098 - Expire settings not saved if you only click Ok

Now we expire when we click on ok (was the last bug in this dialogbox)

FIXED-IN: 4.11
BUG: 320098

M  +8    -4    mailcommon/collectionpage/collectionexpirypage.cpp
M  +1    -1    mailcommon/collectionpage/collectionexpirypage.h

http://commits.kde.org/kdepim/0cc0cd771b65d3ef1648dde98fb2a64fe8c52b1c

diff --git a/mailcommon/collectionpage/collectionexpirypage.cpp \
b/mailcommon/collectionpage/collectionexpirypage.cpp index f442b02..db6c3fc 100644
--- a/mailcommon/collectionpage/collectionexpirypage.cpp
+++ b/mailcommon/collectionpage/collectionexpirypage.cpp
@@ -176,12 +176,12 @@ void CollectionExpiryPage::load( const Akonadi::Collection \
&collection )  void CollectionExpiryPage::save( Akonadi::Collection &collection )
 {
   if ( mChanged)
-    saveAndExpire( collection, false );
+    saveAndExpire( collection, false, true );
 }
 
-void CollectionExpiryPage::saveAndExpire( Akonadi::Collection &collection, bool \
saveSettings ) +void CollectionExpiryPage::saveAndExpire( Akonadi::Collection \
&collection, bool saveSettings, bool _expireNow )  {
-  bool expireNow = saveSettings;
+  bool expireNow = _expireNow;
   bool enableGlobally = expireReadMailCB->isChecked() || \
expireUnreadMailCB->isChecked();  const Akonadi::Collection expireToFolder = \
folderSelector->collection();  if ( enableGlobally && moveToRB->isChecked() && \
!expireToFolder.isValid() ) { @@ -224,13 +224,17 @@ void \
                CollectionExpiryPage::saveAndExpire( Akonadi::Collection &collection, \
                bool
       Akonadi::CollectionModifyJob *job = new Akonadi::CollectionModifyJob( \
collection, this );  job->setProperty( "expireNow", expireNow );
       connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCollectionModified(KJob*)) \
); +  } else {
+      if (expireNow) {
+          MailCommon::Util::expireOldMessages( collection, true /*immediate*/);
+      }
   }
   mChanged = false;
 }
 
 void CollectionExpiryPage::slotSaveAndExpire()
 {
-  saveAndExpire( mCollection, true );                        // save and start \
expire job +  saveAndExpire( mCollection, true, true );                        // \
save and start expire job  }
 
 void CollectionExpiryPage::slotCollectionModified(KJob* job)
diff --git a/mailcommon/collectionpage/collectionexpirypage.h \
b/mailcommon/collectionpage/collectionexpirypage.h index 68ebdd3..0f4bfea 100644
--- a/mailcommon/collectionpage/collectionexpirypage.h
+++ b/mailcommon/collectionpage/collectionexpirypage.h
@@ -58,7 +58,7 @@ protected slots:
     void slotSaveAndExpire();
 
 private:
-    void saveAndExpire( Akonadi::Collection &collection, bool saveSettings );
+    void saveAndExpire( Akonadi::Collection &collection, bool saveSettings, bool \
_expirenow );  
 private:
     QCheckBox *expireReadMailCB;


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