Merge branch 'master' into kinetic

diff --cc src/engine/engine.cpp
index 78be25f,778867f..c146edd
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -207,9 -207,9 +207,9 @@@ void SituareEngine::enableAutomaticLoca
      }
  }
  
- void SituareEngine::error(const int error)
+ void SituareEngine::error(const int context, const int error)
  {
 -    qDebug() << __PRETTY_FUNCTION__;    
 +    qDebug() << __PRETTY_FUNCTION__;
  
      switch(error)
      {
@@@ -477,10 -505,10 +505,10 @@@ void SituareEngine::signalsFromGPS(
  
  void SituareEngine::signalsFromMainWindow()
  {
 -    qDebug() << __PRETTY_FUNCTION__;    
 +    qDebug() << __PRETTY_FUNCTION__;
  
-     connect(m_ui, SIGNAL(error(int)),
-             this, SLOT(error(int)));
+     connect(m_ui, SIGNAL(error(int, int)),
+             this, SLOT(error(int, int)));
  
      connect(m_ui, SIGNAL(fetchUsernameFromSettings()),
              this, SLOT(fetchUsernameFromSettings()));

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

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