Merge branch 'master' into settings_auto_update

Conflicts:
	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 e9e8af8,266e124..ce79926
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -93,8 -95,7 +95,8 @@@ HEADERS += ui/mainwindow.h 
      network/networkreply.h
  QT += network \
      webkit
 +
- #DEFINES += QT_NO_DEBUG_OUTPUT
+ DEFINES += QT_NO_DEBUG_OUTPUT
  
  maemo5 | simulator {
      sbox | simulator {

diff --cc src/ui/mainwindow.cpp
index 1b87b6f,dd21e8a..040a936
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -472,10 -524,34 +529,31 @@@ void MainWindow::openSettingsDialog(
  {
      qDebug() << __PRETTY_FUNCTION__;
  
 -    SettingsDialog *dialog = new SettingsDialog(this);
 -    if(!m_loggedIn) {
 -        dialog->disableSituareSettings();
 -    }
 -    dialog->show();
 +    m_settingsDialog->enableSituareSettings(m_gpsToggleAct->isChecked() && m_loggedIn);
 +    m_settingsDialog->show();
  }
  
+ void MainWindow::saveCookies()
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
+     if(!m_cookieJar)
+         m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
+ 
+     QList<QNetworkCookie> cookieList = m_cookieJar->allCookies();
+     QStringList list;
+ 
+     for(int i=0;i<cookieList.count();i++) {
+         QNetworkCookie cookie = cookieList.at(i);
+         QByteArray byteArray = cookie.toRawForm(QNetworkCookie::Full);
+         list.append(QString(byteArray));
+     }
+     list.removeDuplicates();
+ 
+     QSettings settings(DIRECTORY_NAME, FILE_NAME);
+     settings.setValue(COOKIES, list);
+ }
+ 
  void MainWindow::setAutoCenteringButtonEnabled(bool enabled)
  {
      qDebug() << __PRETTY_FUNCTION__;

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