Merge branch 'master' into cookies_refactored

Conflicts:
	src/common.h
	src/src.pro

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

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

diff --cc src/src.pro
index 4eedcad,a5ce065..fe92caf
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -42,8 -42,10 +42,12 @@@ SOURCES += main.cpp 
      ui/zoombuttonpanel.cpp \
      ui/userinfo.cpp \
      ui/sidepanel.cpp \
 +    networkcookiejar.cpp \
-     ui/zoombutton.cpp
++    ui/zoombutton.cpp \
+     ui/zoombutton.cpp \
+     network/networkaccessmanager.cpp \
+     network/networkhandler.cpp \
+     network/networkreply.cpp
  HEADERS += ui/mainwindow.h \
      map/mapengine.h \
      map/mapview.h \
@@@ -85,17 -87,23 +89,24 @@@
      common.h \
      ui/userinfo.h \
      ui/sidepanel.h \
 +    networkcookiejar.h \
-     ui/zoombutton.h
+     ui/zoombutton.h \
+     network/networkaccessmanager.h \
+     network/networkhandler.h \
+     network/networkreply.h
  QT += network \
      webkit
- #DEFINES += QT_NO_DEBUG_OUTPUT
+ 
+ DEFINES += QT_NO_DEBUG_OUTPUT
  
  maemo5 | simulator {
-     SOURCES += gps/gpspositionprivate.cpp
-     HEADERS += gps/gpspositionprivate.h
-     QT += maemo5
-     CONFIG += mobility
+     INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
+     SOURCES += gps/gpspositionprivate.cpp \
+                network/networkhandlerprivate.cpp
+     HEADERS += gps/gpspositionprivate.h \
+                network/networkhandlerprivate.h
+     QT += maemo5 dbus
+     CONFIG += mobility icd2
      MOBILITY = location
      message([QJson])
      message(Make sure you have QJson development headers installed)

diff --cc src/ui/mainwindow.cpp
index c0847e9,8b58426..6af3a8d
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -267,47 -240,10 +266,45 @@@ void MainWindow::buildZoomButtonPanel(
      connect(this, SIGNAL(minZoomLevelReached()),
              m_zoomButtonPanel, SLOT(disableZoomOutButton()));
  
-     QSettings settings(DIRECTORY_NAME, FILE_NAME);
-     m_zoomButtonPanel->move(settings.value(ZOOMPANEL_POSITION,
-                                            QPoint(ZOOM_BUTTON_PANEL_POSITION_X,
-                                                   ZOOM_BUTTON_PANEL_POSITION_Y)).toPoint());
+     connect(m_mapView, SIGNAL(viewResized(QSize)),
+             m_zoomButtonPanel, SLOT(screenResized(QSize)));
  }
  
 +void MainWindow::clearCookieJar()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    buildWebView();
 +
 +    if(!m_cookieJar) {
 +        m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
 +        qDebug() << "create cookie jar";
 +    }
 +    QList<QNetworkCookie> emptyList;
 +    emptyList.clear();
 +
 +    m_cookieJar->setAllCookies(emptyList);
 +    m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar);
 +}
 +
 +void MainWindow::connectWebViewSignals(bool connectSignals)
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    if(connectSignals) {
 +        connect(m_webView, SIGNAL(urlChanged(const QUrl &)),
 +                this, SIGNAL(updateCredentials(QUrl)));
 +        connect(m_webView, SIGNAL(loadFinished(bool)),
 +                this, SLOT(loadDone(bool)));
 +    }
 +    else {
 +        disconnect(m_webView, SIGNAL(loadFinished(bool)),
 +                   this, SLOT(loadDone(bool)));
 +        disconnect(m_webView, SIGNAL(urlChanged(const QUrl &)),
 +                   this, SLOT(updateCredentials(const QUrl &)));
 +    }
 +}
 +
  void MainWindow::createMenus()
  {
      qDebug() << __PRETTY_FUNCTION__;

diff --cc src/ui/mainwindow.h
Simple merge