Merge branch 'master' into userinfo

[situare] / src / ui / mapviewscreen.cpp

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index c9dff1c..7aeb178 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -79,12 +79,17 @@ MapViewScreen::MapViewScreen(QWidget *parent)
 
     connect(this, SIGNAL(userLocationReady(User*)),
             m_mapEngine, SLOT(receiveOwnLocation(User*)));
+    connect(this, SIGNAL(userLocationReady(User*)),
+            m_mapEngine, SLOT(receiveOwnLocation(User*)));
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             m_mapEngine, SIGNAL(friendsLocationsReady(QList<User*>&)));
 
     connect(m_mapEngine, SIGNAL(mapScrolled()),
             this, SLOT(locationChanged()));
 
+    connect(this, SIGNAL(userLocationReady(User*)),
+            m_userPanel, SLOT(receiveUserData(User*)));
+
     QHBoxLayout *mapViewLayout = new QHBoxLayout;
 
     m_osmLicense = new QLabel(this);