KWeather Sidebar: timer fixes

Signed-off-by: Mavridis Philippe <[email protected]>
(cherry picked from commit 47ea2b84cdae64f9569cf961d0b46d50ff9eadb2)

2 files changed, 8 insertions, 10 deletions

diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index b06bbd8..f191358 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -63,7 +63,9 @@ KonqSidebarWeather::KonqSidebarWeather(TDEInstance* inst, TQObject* parent,
 		kdDebug() << "attached dcop signals..." << endl;
 
 	timeOut = new TQTimer(this, "timeOut" );
-	updateWidgets(true);
+	connect(timeOut, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateWidgets()));
+
+	updateWidgets();
 }
 
 
@@ -114,10 +116,12 @@ void KonqSidebarWeather::handlePreviewOnMouseOver(const KFileItem& item)
 {
 }
 
-void KonqSidebarWeather::updateWidgets( bool firstTime )
+void KonqSidebarWeather::updateWidgets()
 {
 	kdDebug() << "updating station widgets" << endl;
+
 	timeOut->stop();
+
 	DCOPRef dcopCall( "KWeatherService", "WeatherService" );
 	DCOPReply reply = dcopCall.call("listStations()", true );
 
@@ -173,13 +177,7 @@ void KonqSidebarWeather::updateWidgets( bool firstTime )
 		KMessageBox::sorry(0, i18n("The weather service is unreachable!"));
 	}
 
-	if( firstTime )
-    		timeOut->start(15*60000);
-	else
-	{
-		timeOut->changeInterval(15*60000);
-		connect(timeOut, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateWidgets()));
-	}
+	timeOut->start(15*60000);
 }
 
 bool KonqSidebarWeather::startWeatherService()
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index 8607d59..eca74d6 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -53,7 +53,7 @@ public:
     virtual void refresh(TQString);
 
 public slots:
-    virtual void updateWidgets( bool firstTime = false );
+    virtual void updateWidgets();
 
 protected:
     virtual void handleURL(const KURL &url);