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

[Alberto Mardegan]

Prevent a double deletion of the browser dialog

Prevent a double deletion of the browser dialog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://s-jenkins:8080/job/signon-ui-ci/18/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=amd64/18
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=i386/18

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

review: Approve (continuous-integration)

[David King (amigadave)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/signon-ui-autolanding/15/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/signon-ui-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/15/console
    SUCCESS: http://s-jenkins:8080/job/signon-ui-autolanding/./build=pbuilder,distribution=raring,flavor=i386/15

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2012-11-13 10:12:54 +0000
+++ src/browser-request.cpp	2013-03-21 07:31:20 +0000
@@ -31,6 +31,7 @@
 #include <QLabel>
 #include <QNetworkCookie>
 #include <QNetworkRequest>
+#include <QPointer>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRegExp>
@@ -251,7 +252,10 @@
 
 private:
     mutable BrowserRequest *q_ptr;
-    Dialog *m_dialog;
+    /* The dialog can be deleted by the Request class, if it's set as children
+     * of an embedded widget which is then deleted. Therefore, in order to
+     * avoid a double deletion, guard the pointer with a QPointer. */
+    QPointer<Dialog> m_dialog;
     QStackedLayout *m_dialogLayout;
     QWidget *m_webViewPage;
     QWidget *m_successPage;