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

List:       kde-commits
Subject:    experimental: kdenonbeta/akregator/src
From:       Teemu Rytilahti <tpr () d5k ! net>
Date:       2004-10-25 21:12:55
Message-ID: 20041025211255.8E63C16C49 () office ! kde ! org
[Download RAW message or body]

CVS commit by rytilahti: 

Load and save feedlist when handling sessions.
Fixes #84528 (#85471) hopefully.
CCBUG:84528


  M +7 -4      akregator_view.cpp   1.138.2.32
  M +8 -2      akregator_view.h   1.61.2.15


--- kdenonbeta/akregator/src/akregator_view.cpp  #1.138.2.31:1.138.2.32
@@ -1439,9 +1439,10 @@ void aKregatorView::stopLoading()
 }
 
-void aKregatorView::readProperties(KConfig* config)
+void aKregatorView::readProperties(KConfig* config) // this is called when session is being restored
 {
+    // load the standard feedlist, fixes #84528, at least partially -tpr 20041025
+    m_part->openStandardFeedList();
     slotDeleteExpiredArticles();
     // read filter settings 
-    
     m_searchLine->setText(config->readEntry("searchLine"));
     m_searchCombo->setCurrentItem(config->readEntry("searchCombo").toInt()); 
@@ -1478,9 +1479,11 @@ void aKregatorView::readProperties(KConf
             } 
         } // if viewMode != combinedView
-} // if selectedFeed is set
+    } // if selectedFeed is set
 }
-
+// this is called when using session management and session is going to close
 void aKregatorView::saveProperties(KConfig* config)
 {   
+    // save the feedlist, fixes #84528, at least partially -tpr 20041025
+    m_part->saveFeedList();
     // save filter settings
     config->writeEntry("searchLine", m_searchLine->text());

--- kdenonbeta/akregator/src/akregator_view.h  #1.61.2.14:1.61.2.15
@@ -95,5 +95,11 @@ namespace Akregator
             void addFeedToGroup(const QString& url, const QString& group);
 
+            /**
+             * Disables fetch actions and informs the frame to enable stop button
+             */
                 void startOperation();
+            /**
+             * Enables fetch actions and nforms the frame to disable stop button
+             */
             void endOperation();
             void operationError(const QString &msg);


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