From: Sami Rämö <sami.ramo@ixonos.com>
Date: Tue, 9 Nov 2010 12:52:21 +0000 (+0200)
Subject: Emit error signal when login fails
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=a2f9f96e94f3edcaceb87866617799e0f9bd6996

Emit error signal when login fails
---

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 6863324..fbb64e1 100644
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -36,7 +36,7 @@
 #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"
@@ -98,9 +98,6 @@ void FacebookAuthentication::login()
         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)));
 
@@ -133,10 +130,12 @@ void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
 {
     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();
+        emit error(ErrorContext::NETWORK, reply->error());
         destroyLogin();
-        /// @todo Emit error signal
     }
 }