Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist

diff --cc src/engine/engine.cpp
index 4814975,22f2b11..58ab60b
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -43,15 -43,8 +43,16 @@@ SituareEngine::SituareEngine(QMainWindo
      connect(m_situareService, SIGNAL(reverseGeoReady(QString)), m_ui, SIGNAL(reverseGeoReady(QString)));
      connect(m_ui, SIGNAL(statusUpdate(QString,bool)), this, SLOT(requestUpdateLocation(QString,bool)));
      connect(m_situareService, SIGNAL(error(QString)), this, SLOT(error(QString)));
+     connect(m_situareService, SIGNAL(updateWasSuccessful()), this, SLOT(updateWasSuccessful()));
  
 +    connect(m_situareService, SIGNAL(userDataChanged(User*,QList<User*>&)), m_ui,
 +            SIGNAL(userDataChanged(User*,QList<User*>&)));
 +
 +    connect(m_situareService, SIGNAL(userDataChanged(User*,QList<User*>&)), m_ui,
 +            SLOT(userDataReceived(User*,QList<User*>&)));
 +
 +    connect(m_ui, SIGNAL(refreshUserData()), this, SLOT(refreshUserData()));
 +
      start();
  }
  
@@@ -102,18 -95,15 +103,25 @@@ void SituareEngine::requestUpdateLocati
      m_situareService->updateLocation(coordinates, status, publish);
  }
  
 -void SituareEngine::updateFriendsList()
 +void SituareEngine::refreshUserData()
  {
      qDebug() << __PRETTY_FUNCTION__;
 -    //code here
 +
 +    m_ui->toggleProgressIndicator(true);
 +
 +    m_situareService->fetchLocations();
 +}
 +
 +void SituareEngine::userDataReceived(User *user,QList<User*> &friends)
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    m_ui->toggleProgressIndicator(false);
  }
+ 
+ void SituareEngine::updateWasSuccessful()
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
+     m_situareService->fetchLocations();
+ }

diff --cc src/engine/engine.h
index 67d6385,df940d5..d4efca2
--- 1/src/engine/engine.h
--- 2/src/engine/engine.h
+++ b/src/engine/engine.h
@@@ -93,10 -93,10 +93,12 @@@ public slots
      */
      void requestUpdateLocation(const QString &status, const bool &publish);
  
 -    void updateFriendsList();
 +    void refreshUserData();
 +
 +    void userDataReceived(User *user,QList<User*> &friends);
  
+     void updateWasSuccessful();
+ 
  /*******************************************************************************
   * SIGNALS
   ******************************************************************************/