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

Proposed by Alberto Mardegan on 2012-09-12
Status: Merged
Approved by: David King on 2012-09-12
Approved revision: 57
Merged at revision: 57
Proposed branch: lp:~mardy/signon-ui/end-request
Merge into: lp:signon-ui
Diff against target: 16 lines (+2/-2)
1 file modified
src/browser-request.cpp (+2/-2)
To merge this branch: bzr merge lp:~mardy/signon-ui/end-request
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve on 2012-09-12
David King (community) 2012-09-12 Approve on 2012-09-12
Review via email: mp+123899@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

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) wrote :

Looks good.

review: Approve
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/browser-request.cpp'
2--- src/browser-request.cpp 2012-09-10 06:14:54 +0000
3+++ src/browser-request.cpp 2012-09-12 08:10:27 +0000
4@@ -285,10 +285,10 @@
5 if (url.host() == finalUrl.host() &&
6 url.path() == finalUrl.path()) {
7 responseUrl = url;
8- if (q->embeddedUi()) {
9+ if (q->embeddedUi() || !m_dialog->isVisible()) {
10 /* Do not show the notification page. */
11 m_dialog->accept();
12- } else if (m_dialog->isVisible()) {
13+ } else {
14 /* Replace the web page with an information screen */
15 notifyAuthCompleted();
16 }

Subscribers

People subscribed via source and target branches

to all changes: