Merge lp:~mardy/signon-ui/lp1171853 into lp:signon-ui

[Alberto Mardegan]

Cancel fail timer when a load is in progress

If a page is loading, don't make the request fail.

This makes the failure handling a bit more robust (or less hacky).

Cancel fail timer when a load is in progress

If a page is loading, don't make the request fail.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-raring-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-raring-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/10/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Better!

review: Approve

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2013-04-23 14:18:50 +0000
+++ src/browser-request.cpp	2013-04-24 09:23:54 +0000
@@ -238,6 +238,7 @@
 
 private Q_SLOTS:
     void onUrlChanged(const QUrl &url);
+    void onLoadProgress();
     void onLoadFinished(bool ok);
     void onFailTimer();
     void onFinished();
@@ -327,6 +328,11 @@
     setupViewForUrl(url);
 }
 
+void BrowserRequestPrivate::onLoadProgress()
+{
+    m_failTimer.stop();
+}
+
 void BrowserRequestPrivate::onLoadFinished(bool ok)
 {
     TRACE() << "Load finished" << ok;
@@ -457,6 +463,8 @@
     setupViewForUrl(url);
     QObject::connect(m_webView, SIGNAL(urlChanged(const QUrl&)),
                      this, SLOT(onUrlChanged(const QUrl&)));
+    QObject::connect(m_webView, SIGNAL(loadProgress(int)),
+                     this, SLOT(onLoadProgress()));
     QObject::connect(m_webView, SIGNAL(loadFinished(bool)),
                      this, SLOT(onLoadFinished(bool)));
     m_webViewLayout->addWidget(m_webView);