--- a/radioapp/radiouiengine/src/radiostationmodel_p.cpp	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radiouiengine/src/radiostationmodel_p.cpp	Thu Jul 22 16:33:45 2010 +0100
@@ -34,7 +34,7 @@
 /**
  * Timeout period for checking if station is sending dynamic PS in milliseconds
  */
-const int KDynamicPsCheckTimeout = 10 * 1000;
+const int DYNAMIC_PS_CHECK_TIMEOUT = 10 * 1000;
 
 /*!
  *
@@ -46,9 +46,10 @@
     mCurrentStation( &mManualStation ),
     mDynamicPsTimer( new QTimer() )
 {
-    connectAndTest( mDynamicPsTimer.data(), SIGNAL(timeout()),
+    mManualStation.setType( RadioStation::ManualStation );
+    Radio::connect( mDynamicPsTimer.data(), SIGNAL(timeout()),
                     q_ptr,                  SLOT(dynamicPsCheckEnded()) );
-    mDynamicPsTimer->setInterval( KDynamicPsCheckTimeout );
+    mDynamicPsTimer->setInterval( DYNAMIC_PS_CHECK_TIMEOUT );
     mDynamicPsTimer->setSingleShot( true );
 }
 
@@ -89,6 +90,7 @@
         mCurrentStation = &mStations[ frequency ];
     } else {
         mManualStation.reset();
+        mManualStation.setType( RadioStation::ManualStation );
         mManualStation.setFrequency( frequency );
         mCurrentStation = &mManualStation;
     }
@@ -96,6 +98,7 @@
     Q_Q( RadioStationModel );
     if ( oldStation && oldStation->isValid() ) {
         q->emitDataChanged( *oldStation );
+        q->emitDataChanged( *mCurrentStation );
     }
 }
 
@@ -106,7 +109,7 @@
 void RadioStationModelPrivate::setCurrentGenre( uint frequency, int genre )
 {
     Q_Q( RadioStationModel );
-    RadioStation station = q->findCurrentStation( frequency );
+    RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
     if ( !station.isValid() ) {
         LOG( "Unable to find current station. Ignoring RDS" );
         return;
@@ -190,7 +193,7 @@
 {
     Q_Q( RadioStationModel );
     LOG_FORMAT( "void RadioStationModelPrivate::setCurrentPsName: %s", GETSTRING( name ) );
-    RadioStation station = q->findCurrentStation( frequency );
+    RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
     if ( !station.isValid() ) {
         LOG( "Unable to find current station. Ignoring RDS" );
         return;
@@ -251,7 +254,7 @@
 void RadioStationModelPrivate::setCurrentRadioText( uint frequency, const QString& radioText )
 {
     Q_Q( RadioStationModel );
-    RadioStation station = q->findCurrentStation( frequency );
+    RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
     if ( !station.isValid() ) {
         LOG( "Unable to find current station. Ignoring RDS" );
         return;
@@ -268,7 +271,7 @@
 void RadioStationModelPrivate::setCurrentRadioTextPlus( uint frequency, int rtClass, const QString& rtItem )
 {
     Q_Q( RadioStationModel );
-    RadioStation station = q->findCurrentStation( frequency );
+    RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
     if ( !station.isValid() ) {
         LOG( "Unable to find current station. Ignoring RDS" );
         return;
@@ -285,7 +288,7 @@
 void RadioStationModelPrivate::setCurrentPiCode( uint frequency, int piCode )
 {
     Q_Q( RadioStationModel );
-    RadioStation station = q->findCurrentStation( frequency );
+    RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
     if ( !station.isValid() ) {
         LOG( "Unable to find current station. Ignoring RDS" );
         return;
@@ -310,6 +313,7 @@
     if ( persistentSave ) {
         const bool success = mPresetStorage->savePreset( *station.data_ptr() );
         RADIO_ASSERT( success, "RadioStationModelPrivate::saveStation", "Failed to add station" );
+        Q_UNUSED( success );
     }
 }