merge noncore/todayplugins/*

2 files changed, 1 insertions, 2 deletions

diff --git a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
index 23e78f2..2274402 100644
--- a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
+++ b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
-** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 800fdcb..8440f20 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -46,13 +46,13 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
 	QHBoxLayout *layout = new QHBoxLayout( this );
 	layout->setAutoAdd( TRUE );
 	layout->setSpacing( 2 );
 
 	weatherIcon = new QLabel( this );
 	weatherIcon->setMaximumWidth( 32 );
-	QImage logo1 = Resource::loadImage( "todayweatherplugin/wait" );
+	QImage logo1 = Resource::loadImage( "Clock" );
 	QPixmap pic;
 	pic.convertFromImage( logo1 );
 	weatherIcon->setPixmap( pic );
 
 	weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
 	weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );