1 files changed, 4 insertions, 3 deletions

diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index f4ea0f2..800fdcb 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -69,133 +69,134 @@ WeatherPluginWidget::~WeatherPluginWidget()
 	}
 }
 
 void WeatherPluginWidget::timerEvent( QTimerEvent *e )
 {
 	killTimer( e->timerId() );
 	retreiveData();
 }
 
 
 
 void WeatherPluginWidget::retreiveData()
 {
 	Config config( "todayweatherplugin");
 	config.setGroup( "Config" );
 
 	location = config.readEntry( "Location", "" );
 	useMetric = config.readBoolEntry( "Metric", TRUE );
 	frequency = config.readNumEntry( "Frequency", 5 );
 	
 	startTimer( frequency * 60000 );
 
 	localFile = "/tmp/";
 	localFile.append( location );
 	localFile.append( ".TXT" );
 
 	remoteFile = "http://weather.noaa.gov/pub/data/observations/metar/stations/";
 	remoteFile.append( location );
 	remoteFile.append( ".TXT" );
 
 	QFile file( localFile );
 	if ( file.exists() )
 	{
 		file.remove();
 	}
 
 	OProcess *proc = new OProcess;
 
 	*proc << "wget" << "-q" << remoteFile << "-O" << localFile;
 	connect( proc, SIGNAL( processExited( OProcess * ) ), this, SLOT( dataRetrieved( OProcess * ) ) );
 	proc->start();
 }
 
 void WeatherPluginWidget::displayWeather()
 {
 	weatherData = QString::null;
 
 	QFile file( localFile );
-	if ( file.open( IO_ReadOnly ) )
+	
+	if ( file.size() > 0 && file.open( IO_ReadOnly ) )
 	{
 		QTextStream data( &file );
 		while ( !data.eof() )
 		{
 			weatherData.append( data.readLine() );
 		}
 		file.close();
 		weatherData = weatherData.simplifyWhiteSpace();
 
 		QString tmpstr;
 
 		tmpstr.append( tr( "Temp: " ) );
 		getTemp( weatherData );
 		tmpstr.append( dataStr );
 
 		tmpstr.append( tr( "  Wind: " ) );
 		getWind( weatherData );
 		tmpstr.append( dataStr );
 
 		tmpstr.append( tr( "\nPres: " ) );
 		getPressure( weatherData );
 		tmpstr.append( dataStr );
 
 		weatherLabel->setText( tmpstr );
 
 		tmpstr = "todayweatherplugin/";
 		getIcon( weatherData );
 		tmpstr.append( dataStr );
 		QImage logo1 = Resource::loadImage( tmpstr );
 		QPixmap pic;
 		pic.convertFromImage( logo1 );
 		weatherIcon->setPixmap( pic );
 	}
 	else
 	{
-		weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+		weatherLabel->setText( tr( "Current weather data not available." ) );
 	}
 }
 
 void WeatherPluginWidget::getTemp( const QString &data )
 {
 	int value;
 	bool ok;
 
 	int pos = data.find( QRegExp( "M?[0-9]+/M?[0-9]+" ), 20 );
 	if ( pos > -1 )
 	{
 		if ( data.at( pos ) == 'M' )
 		{
 			value = -1 * data.mid( pos + 1, 2 ).toInt( &ok );
 		}
 		else
 		{
 			value = data.mid( pos, 2 ).toInt( &ok );
 		}
 		if ( useMetric )
 		{
 			dataStr = QString::number( value );
 			dataStr.append( 'C' );
 		}
 		else
 		{
 			dataStr = QString::number( ( value * 9 / 5 ) + 32 );
 			dataStr.append( 'F' );
 		}
 	}
 	else
 	{
 		dataStr = tr( "n/a" );
 	}
 }
 
 void WeatherPluginWidget::getWind( const QString &data )
 {
 	int value;
 	bool ok;
 
 	int pos = data.find( QRegExp( "[0-9]*G*[0-9]*KT" ), 20 );
 	if ( pos > -1 )
 	{
 		if ( data.mid( pos, 3 ) != "VRB" )
 		{
 			value = data.mid( pos, 3 ).toInt( &ok );
 			if ( ( value >= 0 && value < 23 ) || ( value >= 239 && value <= 360 ) )
@@ -274,51 +275,51 @@ void WeatherPluginWidget::getPressure( const QString &data )
 		dataStr = tr( "n/a" );
 	}
 }
 
 void WeatherPluginWidget::getIcon(const QString &data )
 {
 	dataStr = "psunny";
 	if ( data.find( "CLR ", 20  ) > -1 ||
 		 data.find( "SKC ", 20  ) > -1 ||
 		 data.find( "CAVOK ", 20  ) > -1 )
 	{
 		dataStr = "sunny";
 	}
 	else if ( data.find( "SH ", 20 ) > -1 ||
 			  data.find( "DZ ", 20 ) > -1 ||
 			  data.find( "RA ", 20 ) > -1 ||
 			  data.find( "UP ", 20 ) > -1 ||
 			  data.find( "BR ", 20 ) > -1 )
 	{
 		dataStr = "shower";
 	}
 	else if ( data.find( "TS ", 20 ) > -1 )
 	{
 		dataStr = "tstorm";
 	}
 	else if ( data.find( "SN ", 20 ) > -1 ||
 			  data.find( "SG ", 20 ) > -1 )
 	{
 		dataStr = "snow";
 	}
 	else if ( data.find( "FZ ", 20 ) > -1 ||
 			  data.find( "GR ", 20 ) > -1 ||
 			  data.find( "GS ", 20 ) > -1 ||
 			  data.find( "PE ", 20 ) > -1 ||
 			  data.find( "IC ", 20 ) > -1 )
 	{
 		dataStr = "sleet";
 	}
 }
 
 void WeatherPluginWidget::dataRetrieved( OProcess *process )
 {
 	if ( process->normalExit() )
 	{
 		displayWeather();
 	}
 	else
 	{
-		weatherLabel->setText( tr( "Current weather data not available.\nTry looking out the window." ) );
+		weatherLabel->setText( tr( "Current weather data not available." ) );
 	}
 }