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

List:       kde-commits
Subject:    kdepim/akregator/src
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2005-04-19 7:50:36
Message-ID: 20050419075036.0427E5FA () office ! kde ! org
[Download RAW message or body]

CVS commit by osterfeld: 

fix the stop action I broke yesterday evening


  M +3 -3      akregator_part.cpp   1.163
  M +1 -3      akregator_part.h   1.72
  M +6 -0      akregator_view.cpp   1.242
  M +1 -1      akregator_view.h   1.93


--- kdepim/akregator/src/akregator_part.cpp  #1.162:1.163
@@ -493,8 +493,8 @@ bool Part::openFile()
 }
 
-bool Part::closeURL()
+void Part::slotStop()
 {
-    kdWarning() << "Part::closeURL() called!" << endl;
-    return MyBasePart::closeURL();
+    m_view->slotAbortFetches();
+    setStatusBar(QString::null);
 }
 

--- kdepim/akregator/src/akregator_part.h  #1.71:1.72
@@ -107,6 +107,4 @@ namespace Akregator
             virtual bool openURL(const KURL& url);
 
-            virtual bool Part::closeURL();
-            
             /** Opens standard feedlist */
             virtual void openStandardFeedList();
@@ -204,5 +202,5 @@ namespace Akregator
 
         private slots:
-            void slotStop() {closeURL(); };
+            void slotStop();
 
          private: // attributes

--- kdepim/akregator/src/akregator_view.cpp  #1.241:1.242
@@ -425,4 +425,10 @@ void View::slotLoadingProgress(int perce
 }
 
+void View::slotAbortFetches()
+{
+    endOperation();
+    m_transaction->stop();
+}
+
 QString View::getTitleNodeText(const QDomDocument &doc)
 {

--- kdepim/akregator/src/akregator_view.h  #1.92:1.93
@@ -193,5 +193,5 @@ namespace Akregator
             void slotLoadingProgress(int);
 
-            
+            void slotAbortFetches();
             void slotFetchesCompleted();
            


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