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

Conflicts:
	src/ui/mainwindow.cpp

diff --cc src/ui/mainwindow.cpp
index 1ad8cb1,4242c3b..a695eee
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -337,8 -337,11 +337,14 @@@ void MainWindow::buildPanels(
      connect(m_friendsListPanel, SIGNAL(showPanelRequested(QWidget*)),
              m_tabbedPanel, SLOT(showPanel(QWidget*)));
  
 +    connect(m_routingPanel, SIGNAL(showPanelRequested(QWidget*)),
 +            m_tabbedPanel, SLOT(showPanel(QWidget*)));
++
+     connect(m_tabbedPanel, SIGNAL(panelClosed()),
+             m_friendsListPanel, SLOT(anyPanelClosed()));
+ 
+     connect(m_tabbedPanel, SIGNAL(panelOpened()),
+             m_friendsListPanel, SLOT(anyPanelOpened()));
  }
  
  void MainWindow::buildRoutingPanel()