projects
/
situare
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Emit error signal when login fails
[situare]
/
src
/
facebookservice
/
facebookauthentication.cpp
diff --git
a/src/facebookservice/facebookauthentication.cpp
b/src/facebookservice/facebookauthentication.cpp
index
6863324
..
fbb64e1
100644
(file)
--- a/
src/facebookservice/facebookauthentication.cpp
+++ b/
src/facebookservice/facebookauthentication.cpp
@@
-36,7
+36,7
@@
#endif // Q_WS_MAEMO_5
#include "common.h"
#endif // Q_WS_MAEMO_5
#include "common.h"
-#include "error.h"
+#include "../error.h"
#include "network/networkcookiejar.h"
#include "situareservice/situarecommon.h"
#include "ui/mainwindow.h"
#include "network/networkcookiejar.h"
#include "situareservice/situarecommon.h"
#include "ui/mainwindow.h"
@@
-98,9
+98,6
@@
void FacebookAuthentication::login()
if (m_browser) {
m_browser->page()->networkAccessManager()->setCookieJar(new NetworkCookieJar());
if (m_browser) {
m_browser->page()->networkAccessManager()->setCookieJar(new NetworkCookieJar());
- connect(m_browser, SIGNAL(loadFinished(bool)),
- this, SLOT(loadFinished(bool)));
-
connect(m_browser, SIGNAL(urlChanged(QUrl)),
this, SLOT(urlChanged(QUrl)));
connect(m_browser, SIGNAL(urlChanged(QUrl)),
this, SLOT(urlChanged(QUrl)));
@@
-133,10
+130,12
@@
void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
{
qWarning() <<__PRETTY_FUNCTION__;
{
qWarning() <<__PRETTY_FUNCTION__;
- if (reply->error() != QNetworkReply::NoError) {
+ if ((reply->error() != QNetworkReply::NoError)
+ && (reply->error() != QNetworkReply::OperationCanceledError)) {
+
qCritical() << __PRETTY_FUNCTION__ << "error:" << reply->error() << reply->errorString();
qCritical() << __PRETTY_FUNCTION__ << "error:" << reply->error() << reply->errorString();
+ emit error(ErrorContext::NETWORK, reply->error());
destroyLogin();
destroyLogin();
- /// @todo Emit error signal
}
}
}
}