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

List:       kde-commits
Subject:    experimental: kdenonbeta/akregator/src
From:       Frank Osterfeld <f_osterf () informatik ! uni-kl ! de>
Date:       2004-10-24 22:06:29
Message-ID: 20041024220629.516F716C57 () office ! kde ! org
[Download RAW message or body]

CVS commit by osterfeld: 

fix deletion of expired articles when a keep flag was set


  M +15 -11    feed.cpp   1.49.2.15


--- kdenonbeta/akregator/src/feed.cpp  #1.49.2.14:1.49.2.15
@@ -445,7 +445,8 @@ void Feed::slotDeleteExpiredArticles()
 {
     bool changed = false;
-    if ( (m_archiveMode == globalDefault && \
Settings::EnumArchiveMode::limitArticleAge) || m_archiveMode == limitArticleAge ) +   \
if ( (m_archiveMode == globalDefault && Settings::archiveMode() == \
Settings::EnumArchiveMode::limitArticleAge) || m_archiveMode == limitArticleAge )  {
-        long expiryInSec;
+        
+        long expiryInSec = 0;
         
            if (m_archiveMode == limitArticleAge)
@@ -454,4 +455,5 @@ void Feed::slotDeleteExpiredArticles()
             expiryInSec = Settings::maxArticleAge() * 3600 * 24;
             
+        kdDebug() << title() << ": expiry: " << expiryInSec << endl;    
         QDateTime now = QDateTime::currentDateTime();
         ArticleSequence::ConstIterator it;
@@ -464,5 +466,7 @@ void Feed::slotDeleteExpiredArticles()
         while ( !foundNotYetExpired && it != end )
         {
-            if ( !(*it).keep() && (*it).pubDate().secsTo(now) > expiryInSec)
+            if (!(*it).keep())
+            {
+                if ( (*it).pubDate().secsTo(now) > expiryInSec)
             {
                 tmp = it;
@@ -470,5 +474,4 @@ void Feed::slotDeleteExpiredArticles()
                 m_articles.remove(*tmp);
                 changed = true;
-         
             }
             else 
@@ -476,4 +479,5 @@ void Feed::slotDeleteExpiredArticles()
         }    
     }    
+    }    
     if (changed)
         modified();


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