Merge branch 'login_browser' into qml

Conflicts:
	src/src.pro

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

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

diff --cc src/facebookservice/facebookauthentication.cpp
index 11f5a10,863b9c5..0707f60
--- 1/src/facebookservice/facebookauthentication.cpp
--- 2/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@@ -57,26 -57,9 +57,26 @@@ FacebookAuthentication::FacebookAuthent
      qDebug() << __PRETTY_FUNCTION__;
  }
  
 +QUrl FacebookAuthentication::url() const
 +{
 +//    return QUrl("http://touch.facebook.com/login.php?app_id=215161445226&fbconnect=1&next=http%3A%2F%2Fwww.facebook.com%2Fconnect%2Fuiserver.php%3Fapp_id%3D215161445226%26method%3Dpermissions.request%26display%3Dtouch%26next%3Dhttp%253A%252F%252Fwww.facebook.com%252Fconnect%252Flogin_success.html%26type%3Duser_agent%26fbconnect%3D1%26from_login%3D1");
 +//    return QUrl("http://www.fi");
 +    QString url = FB_LOGIN_URL + "?";
 +    url.append("api_key=" + API_KEY +"&");
 +    url.append("display=touch&");
 +    url.append("fbconnect=1&");
 +    url.append("next=" + FB_LOGIN_SUCCESS_URL + "&");
 +    url.append("return_session=1&");
 +    url.append("session_version=3&");
 +    url.append("v=1.0&");
 +    url.append("req_perms=publish_stream");
 +    qWarning() << __PRETTY_FUNCTION__ << url;
 +    return QUrl(url);
 +}
 +
  void FacebookAuthentication::browserDestroyed()
  {
-     qWarning() << __PRETTY_FUNCTION__;
+     qDebug() << __PRETTY_FUNCTION__;
  
      m_mainWindow->toggleProgressIndicator(false);
      m_browser = 0;
@@@ -247,11 -223,9 +244,11 @@@ void FacebookAuthentication::urlChanged
      } else if (urlString.startsWith(FB_LOGIN_SUCCESS_URL)) {
          // login succeeded, permissions granted/declined
          const QString session = parseSession(url);
-         qWarning() << __PRETTY_FUNCTION__ << "login finished, parsed session:" << session;
+         qDebug() << __PRETTY_FUNCTION__ << "login finished, parsed session:" << session;
          if (!session.isEmpty()) {
 +#ifndef QML_UI
              destroyLogin();
 +#endif
              m_loggedIn = true;
              emit loggedIn(session, urlString.contains(WALL_POST_PERMISSION));
          }

diff --cc src/src.pro
index 928ab7b,4b3c123..91685ca
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -7,9 -5,7 +7,8 @@@ TARGET = ../situar
  TEMPLATE = app
  LIBS += -lqjson
  RESOURCES += ../images.qrc \
 -    ../languages.qrc
 +    ../languages.qrc \
-     qmlui/res.qrc \
- 
++    qmlui/res.qrc
  TRANSLATIONS += ../res/languages/situare_fi.ts
  SOURCES += main.cpp \
      application.cpp \
@@@ -88,11 -84,7 +87,12 @@@
      ui/zoombuttonpanel.cpp \
      user/user.cpp \
      ui/listitemcontextbuttonbar.cpp \
 +    qmlui/geomap.cpp \
 +    qmlui/loginlogic.cpp \
 +    qmlui/rotation.cpp \
-     routing/routemodel.cpp
++    routing/routemodel.cpp \
+     engine/updatelocation.cpp
 +
  HEADERS += application.h \
      common.h \
      coordinates/geocoordinate.h \
@@@ -178,26 -170,9 +178,27 @@@
      ui/zoombuttonpanel.h \
      user/user.h \
      ui/listitemcontextbuttonbar.h \
 +    qmlui/geomap.h \
 +    qmlui/loginlogic.h \
 +    qmlui/rotation.h \
-     routing/routemodel.h
++    routing/routemodel.h \
+     engine/updatelocation.h
 +
 +OTHER_FILES += qmlui/Main.qml \
 +    qmlui/Dialog.qml \
 +    qmlui/LoginWidget.qml \
 +    qmlui/Button.qml \
 +    qmlui/FriendsModel.qml \
 +    qmlui/Map.qml \
 +    qmlui/PanelContents.qml \
 +    qmlui/List.qml \
 +    qmlui/RoutingPanel.qml \
 +    qmlui/RoutingDelegate.qml
 +
  QT += network \
 -    webkit
 +    webkit  \
 +    declarative
 +
  DEFINES += QT_NO_DEBUG_OUTPUT
  
  simulator {