From e8203322cab84543b83852b459a40e9e4379a04c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sami=20R=C3=A4m=C3=B6?= Date: Thu, 23 Sep 2010 13:09:43 +0300 Subject: [PATCH] Made using the test server simpler - Add DEFINES+=USE_TEST_SERVER into qmake parameters if you would like to compile the application to use test server. Remember to recompile the whole application. --- src/common.h | 5 ++--- src/situareservice/situarecommon.h | 15 +++++++++------ src/ui/mainwindow.cpp | 8 +++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/common.h b/src/common.h index 2c1ab24..8d74ac9 100644 --- a/src/common.h +++ b/src/common.h @@ -47,10 +47,9 @@ const QColor COLOR_GRAY = QColor(152, 152, 152); ///< Gra const QFont NOKIA_FONT_NORMAL = QFont("Nokia Sans", 18, QFont::Normal); ///< Normal font const QFont NOKIA_FONT_SMALL = QFont("Nokia Sans", 13, QFont::Normal); ///< Small font -// Facobook login page pieces +// Facebook login page pieces const QString FACEBOOK_LOGINBASE = "http://www.facebook.com/login.php?"; -const QString SITUARE_PUBLIC_FACEBOOKAPI_KEY = "api_key=4197c64da2fb6b927236feaea32d7d81"; -const QString SITUARE_DEVELOPER_FACEBOOK_APIKEY = "api_key=cf77865a5070f2c2ba3b52cbf3371579"; +const QString API_KEY_PARAMETER_NAME = "api_key="; const QString INTERVAL1 = "&connect_display=popup&v=1.0&next="; const QString SITUARE_LOGIN_SUCCESS = "http://www.facebook.com/connect/login_success.html"; const QString INTERVAL2 = "&cancel_url="; diff --git a/src/situareservice/situarecommon.h b/src/situareservice/situarecommon.h index a341f9d..0f7b4a2 100644 --- a/src/situareservice/situarecommon.h +++ b/src/situareservice/situarecommon.h @@ -25,12 +25,15 @@ #include // Situare server constants -const QString SITUARE_URL = "http://client.situare.net/"; -const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81"; - -// Test server constants -const QString SITUARE_TEST_URL = "http://emmerichgn.facebook.joyent.us/"; -const QString TEST_API_KEY = "cf77865a5070f2c2ba3b52cbf3371579"; +#ifndef USE_TEST_SERVER + // Production server + const QString SITUARE_URL = "http://client.situare.net/"; + const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81"; +#else + // Test server + const QString SITUARE_URL = "http://emmerichgn.facebook.joyent.us/"; + const QString API_KEY = "cf77865a5070f2c2ba3b52cbf3371579"; +#endif // Situare JSON callback data const QString NORMAL_SIZE_PROFILE_IMAGE = "pic"; diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 5ec1c40..244fc01 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -47,11 +47,11 @@ #include "routingpanel.h" #include "searchdialog.h" #include "settingsdialog.h" +#include "situareservice/situarecommon.h" #include "tabbedpanel.h" #include "userinfopanel.h" #include "zoombuttonpanel.h" - #include "mainwindow.h" // These MUST BE HERE, compiling for Maemo fails if moved @@ -572,7 +572,8 @@ void MainWindow::dialogFinished(int status) QStringList urlParts; urlParts.append(FACEBOOK_LOGINBASE); - urlParts.append(SITUARE_PUBLIC_FACEBOOKAPI_KEY); + urlParts.append(API_KEY_PARAMETER_NAME); + urlParts.append(API_KEY); urlParts.append(INTERVAL1); urlParts.append(SITUARE_LOGIN_SUCCESS); urlParts.append(INTERVAL2); @@ -812,7 +813,8 @@ void MainWindow::loginUsingCookies() QStringList urlParts; urlParts.append(FACEBOOK_LOGINBASE); - urlParts.append(SITUARE_PUBLIC_FACEBOOKAPI_KEY); + urlParts.append(API_KEY_PARAMETER_NAME); + urlParts.append(API_KEY); urlParts.append(INTERVAL1); urlParts.append(SITUARE_LOGIN_SUCCESS); urlParts.append(INTERVAL2); -- 1.7.9.5