Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / ui / userinfopanel.cpp

diff --git a/src/ui/userinfopanel.cpp b/src/ui/userinfopanel.cpp
index af8670a..2c48092 100644 (file)
--- a/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@ -67,8 +67,8 @@ UserInfoPanel::UserInfoPanel(QWidget *parent)
     connect(m_userInfo,SIGNAL(requestReverseGeo()),
             this, SIGNAL(requestReverseGeo()));
 
-    connect(m_userInfo, SIGNAL(statusUpdate(QString,bool)),
-            this, SIGNAL(statusUpdate(QString,bool)));
+    connect(m_userInfo, SIGNAL(statusUpdate(QString, bool)),
+            this, SIGNAL(statusUpdate(QString, bool)));
 
     connect(m_userInfo, SIGNAL(notificateUpdateFailing(QString, bool)),
              this, SIGNAL(notificateUpdateFailing(QString, bool)));
@@ -79,6 +79,9 @@ UserInfoPanel::UserInfoPanel(QWidget *parent)
     connect(this, SIGNAL(clearUpdateLocationDialogData()),
             m_userInfo, SLOT(clearUpdateLocationDialogData()));
 
+    connect(this, SIGNAL(collapse()),
+            m_userInfo, SLOT(collapse()));
+
     ImageButton *updateFriendsButton = new ImageButton(":/res/images/refresh.png",
                                                        ":/res/images/refresh_s.png",
                                                        "", this);