--- a/radioapp/radiowidgets/src/radiomainview.cpp	Tue Jul 06 14:16:27 2010 +0300
+++ b/radioapp/radiowidgets/src/radiomainview.cpp	Wed Aug 18 09:49:03 2010 +0300
@@ -88,8 +88,7 @@
         updateFavoriteButton();
         mFrequencyScanner.take();
 
-//        const bool firsTimeStart = mUiEngine->isFirstTimeStart();
-        const bool firsTimeStart = false; // TODO! RadioServer terminates. Fix available in NCP 25 or 27.
+        const bool firsTimeStart = mUiEngine->isFirstTimeStart();
         const int rowCount = mUiEngine->stationModel().rowCount();
         if ( firsTimeStart && rowCount != 0 ) {
             mUiEngine->setFirstTimeStartPerformed( true );
@@ -120,6 +119,7 @@
 
     mCarousel = mUiLoader->findObject<RadioStationCarousel>( DOCML::MV_NAME_STATION_CAROUSEL );
     mCarousel->init( *mUiLoader, mUiEngine.data() );
+    mCarousel->setLandscape( mMainWindow->orientation() == Qt::Horizontal );
 
     mFrequencyStrip = mUiLoader->findObject<RadioFrequencyStrip>( DOCML::MV_NAME_FREQUENCY_STRIP );
     mFrequencyStrip->init( mUiEngine.data(), *mUiLoader );
@@ -189,8 +189,7 @@
 #endif // BUILD_WIN32
     setNavigationAction( backAction );
 
-//    const bool firsTimeStart = mUiEngine->isFirstTimeStart();
-    const bool firsTimeStart = false; // TODO! RadioServer terminates. Fix available in NCP 25 or 27.
+    const bool firsTimeStart = mUiEngine->isFirstTimeStart();
     const int rowCount = mUiEngine->stationModel().rowCount();
     if ( firsTimeStart && rowCount == 0 ){
         QTimer::singleShot( 100, this, SLOT(toggleScanning()) );
@@ -211,6 +210,7 @@
     loadSection( DOCML::FILE_MAINVIEW, mMainWindow->orientationSection() );
     if ( mCarousel && mFrequencyStrip ) {
         mCarousel->setFrequency( mFrequencyStrip->frequency(), TuneReason::Unspecified );
+        mCarousel->setLandscape( mMainWindow->orientation() == Qt::Horizontal );
     }
 }
 
@@ -420,7 +420,7 @@
  */
 void RadioMainView::handleFavoriteChange( const RadioStation& station )
 {
-    mFrequencyStrip->updateFavorite( station );
+    mFrequencyStrip->updateFavorite( station.frequency() );
     updateFavoriteButton();
 }