projects
/
situare
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made using the test server simpler
[situare]
/
src
/
ui
/
mainwindow.cpp
diff --git
a/src/ui/mainwindow.cpp
b/src/ui/mainwindow.cpp
index
5ec1c40
..
244fc01
100644
(file)
--- a/
src/ui/mainwindow.cpp
+++ b/
src/ui/mainwindow.cpp
@@
-47,11
+47,11
@@
#include "routingpanel.h"
#include "searchdialog.h"
#include "settingsdialog.h"
#include "routingpanel.h"
#include "searchdialog.h"
#include "settingsdialog.h"
+#include "situareservice/situarecommon.h"
#include "tabbedpanel.h"
#include "userinfopanel.h"
#include "zoombuttonpanel.h"
#include "tabbedpanel.h"
#include "userinfopanel.h"
#include "zoombuttonpanel.h"
-
#include "mainwindow.h"
// These MUST BE HERE, compiling for Maemo fails if moved
#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);
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);
urlParts.append(INTERVAL1);
urlParts.append(SITUARE_LOGIN_SUCCESS);
urlParts.append(INTERVAL2);
@@
-812,7
+813,8
@@
void MainWindow::loginUsingCookies()
QStringList urlParts;
urlParts.append(FACEBOOK_LOGINBASE);
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);
urlParts.append(INTERVAL1);
urlParts.append(SITUARE_LOGIN_SUCCESS);
urlParts.append(INTERVAL2);