Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

diff --combined src/BusinessLogic/UIManager.cpp
index 505597b,59db6d7..eb80616
--- 1/src/BusinessLogic/UIManager.cpp
--- 2/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@@ -85,6 -85,7 +85,7 @@@ void UIManager::createSettingsView(
        
        // Connect signals
        connect( iSettingsView, SIGNAL( okClicked() ), this, SLOT( settingsOkClicked() ) );
+       connect( iSettingsView, SIGNAL( cancelClicked() ), this, SLOT( settingsCancelClicked() ) );
  }
  
  void UIManager::createRoomStatusIndicator()
@@@ -243,8 -244,9 +244,8 @@@ void UIManager::currentRoomChanged(Roo
        qDebug() << "[UIManager::currentRoomChanged] <Invoked>";
        if ( iWeeklyView != 0 )
        {
 -              QDateTime from = QDateTime( iWeeklyView->beginnigOfShownWeek() );
 -              QDateTime to = QDateTime( from.addDays( 8 ) );
 -              iEngine->fetchMeetings( from, to, aRoom );
 +              QDateTime shown = QDateTime( iWeeklyView->beginnigOfShownWeek() );
 +              iEngine->fetchMeetings( shown.date().weekNumber(), shown.date().year(), aRoom );
        }
  }
  
@@@ -305,3 -307,13 +306,13 @@@ void UIManager::hideProgressBar(
                iProgressBar->close();
        }
  }
+ 
+ void UIManager::settingsCancelClicked()
+ {
+       // Show the weekly view and restart the idle timer
+       if ( iWeeklyView != 0 )
+       {
+               iWindowManager->showView( static_cast<ViewBase *>( iWeeklyView ) );
+               iEngine->startIdleTimeCounter();
+       }
+ }