Merge branch 'logout_refactored'

Conflicts:
	src/ui/mainwindow.h

diff --cc src/engine/engine.cpp
index 2df601f,79a01ab..00d25d5
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -250,8 -286,11 +286,11 @@@ void SituareEngine::signalsFromGPS(
  
  void SituareEngine::signalsFromMainWindow()
  {
 -    qDebug() << __PRETTY_FUNCTION__;
 +    qDebug() << __PRETTY_FUNCTION__;    
  
+     connect(m_ui, SIGNAL(loginPressed()),
+             this, SLOT(loginPressed()));
+ 
      connect(m_ui, SIGNAL(updateCredentials(QUrl)),
              m_facebookAuthenticator, SLOT(updateCredentials(QUrl)));
  

diff --cc src/engine/engine.h
Simple merge

diff --cc src/map/mapengine.cpp
Simple merge

diff --cc src/ui/mainwindow.cpp
index a93df5d,8c0942c..4babd8f
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -118,11 -117,8 +118,11 @@@ void MainWindow::buildFriendListPanel(
      connect(m_mapView, SIGNAL(viewResized(QSize)),
              m_friendsListPanel, SLOT(screenResized(QSize)));
  
 +    connect(this, SIGNAL(locationItemClicked(QList<QString>)),
 +            m_friendsListPanel, SLOT(showFriendsInList(QList<QString>)));
 +
      connect(m_mapView, SIGNAL(viewResizedNewSize(int, int)),
-             friendsListPanelSidebar, SLOT(reDrawSidebar(int, int)));
+             m_friendsListPanelSidebar, SLOT(reDrawSidebar(int, int)));
  }
  
  void MainWindow::buildManualLocationCrosshair()

diff --cc src/ui/mainwindow.h
index e7c15a4,ebeb9d4..691a112
--- 1/src/ui/mainwindow.h
--- 2/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@@ -74,8 -76,15 +76,15 @@@ private
  /*******************************************************************************
   * MEMBER FUNCTIONS AND SLOTS
   ******************************************************************************/
 -public:
 +public:    
      /**
+     * @brief
+     *
+     * @param logged
+     */
+     void loggedIn(bool logged);
+ 
+     /**
      * @brief Enable / disable auto centering button.
      *
      * @param enabled true if shoud be enabled, false otherwise
@@@ -301,13 -317,12 +317,19 @@@ signals
      void friendsLocationsReady(QList<User *> &friendsList);
  
      /**
 +    * @brief Signal is emitted when location item is clicked.
 +    *
 +    * @param userIDs list of friends user IDs in the group
 +    */
 +    void locationItemClicked(const QList<QString> &userIDs);
 +
 +    /**
+     * @brief Signals when Login/Logout action is pressed
+     *
+     */
+     void loginPressed();
+ 
+     /**
      * @brief MapView has been resized
      *
      * @param size view size