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

Conflicts:
	src/ui/listviewscreen.h

diff --cc src/engine/engine.cpp
index 3bbcc2d,3bbcc2d..4814975
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -47,6 -47,6 +47,9 @@@ SituareEngine::SituareEngine(QMainWindo
      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();
@@@ -103,5 -103,5 +106,14 @@@ void SituareEngine::refreshUserData(
  {
      qDebug() << __PRETTY_FUNCTION__;
  
++    m_ui->toggleProgressIndicator(true);
++
      m_situareService->fetchLocations();
  }
++
++void SituareEngine::userDataReceived(User *user,QList<User*> &friends)
++{
++    qDebug() << __PRETTY_FUNCTION__;
++
++    m_ui->toggleProgressIndicator(false);
++}

diff --cc src/engine/engine.h
index 4502fd2,4502fd2..67d6385
--- 1/src/engine/engine.h
--- 2/src/engine/engine.h
+++ b/src/engine/engine.h
@@@ -95,6 -95,6 +95,8 @@@ public slots
  
      void refreshUserData();
  
++    void userDataReceived(User *user,QList<User*> &friends);
++
  /*******************************************************************************
   * SIGNALS
   ******************************************************************************/

diff --cc src/ui/listviewscreen.h
index 336dc9c,e407b6e..2700b0b
--- 1/src/ui/listviewscreen.h
--- 2/src/ui/listviewscreen.h
+++ b/src/ui/listviewscreen.h
@@@ -57,26 -57,18 +57,29 @@@ public
   * MEMBER FUNCTIONS AND SLOTS
   ******************************************************************************/
  public slots:
 +    /**
-     * @brief Slot to open Location update dialog
-     */
-     void updateMessage();
- 
-     /**
 +    * @brief Slot for new user and friend data.
 +    *
 +    * @param user User object
 +    * @param friends list of User objects
 +    */
      void userDataChanged(User* user,QList<User*>& friends);
  
  signals:
 +    /**
 +    * @brief Signal for progress bar indicator toggling.
 +    *
 +    * @param state true if progress bar should be shown, false otherwise
 +    */
      void toggleProgressIndicator(bool state);
+     /**
+     * @brief Forwarding signal from InfoTab to parent to open update dialog
+     */
+     void launchUpdateDialog();
+     /**
+     * @brief  Forwarding signal from InfoTab to parent to update friends list data
+     */
+     void updateFriendsData();
  
  /*******************************************************************************
   * DATA MEMBERS

diff --cc src/ui/mainwindow.h
index 0ee81ba,0ee81ba..e8f52fa
--- 1/src/ui/mainwindow.h
--- 2/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@@ -80,6 -80,6 +80,8 @@@ public slots
      */
      void toMapView();
  
++    void toggleProgressIndicator(bool state);
++
  private:
      /**
      * @brief Private method to create the Menu items
@@@ -105,12 -105,12 +107,10 @@@ private slots
      */
      void openLocationUpdateDialog();
  
  /*******************************************************************************
   * SIGNALS
   ******************************************************************************/
--signals:
++ signals:
      /**
      * @brief Signal for requesting reverseGeo from SituareEngine
      *
@@@ -132,10 -132,10 +132,10 @@@
      */
      void statusUpdate(const QString &status, const bool &publish);
  
--    void userDataChanged(User*,QList<User*>&);
--
      void refreshUserData();
  
++    void userDataChanged(User*,QList<User*>&);
++
  /*******************************************************************************
   * DATA MEMBERS
   ******************************************************************************/