Merge lp:~mardy/signon-ui/end-request into lp:signon-ui

[Alberto Mardegan]

Don't show the final dialog if no UI was previously shown

If the request is completed without having shown any UI, don't bring up the
dialog just to tell the user that the request has finished.

[Alberto Mardegan (mardy)]

Just realized that I got myself confused with the description. :-)
The change here is not about showing the notification, but about terminating the request (by calling m_dialog()->accept()) instead of continuing loading the page.

[David King (amigadave)]

Looks good.

review: Approve

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:57
http://s-jenkins:8080/job/online-accounts-signon-ui-ci/9/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/online-accounts-signon-ui-ci/./label=quantal/9/console

review: Approve (continuous-integration)

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2012-09-10 06:14:54 +0000
+++ src/browser-request.cpp	2012-09-12 08:10:27 +0000
@@ -285,10 +285,10 @@
     if (url.host() == finalUrl.host() &&
         url.path() == finalUrl.path()) {
         responseUrl = url;
-        if (q->embeddedUi()) {
+        if (q->embeddedUi() || !m_dialog->isVisible()) {
             /* Do not show the notification page. */
             m_dialog->accept();
-        } else if (m_dialog->isVisible()) {
+        } else {
             /* Replace the web page with an information screen */
             notifyAuthCompleted();
         }