Merge lp:~mardy/ubuntu-system-settings-online-accounts/webview-disconnect into lp:ubuntu-system-settings-online-accounts/rtm-14.09

Proposed by David Barth
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 208
Merged at revision: 208
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/webview-disconnect
Merge into: lp:ubuntu-system-settings-online-accounts/rtm-14.09
Diff against target: 12 lines (+2/-0)
1 file modified
online-accounts-ui/browser-request.cpp (+2/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/webview-disconnect
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+253979@code.launchpad.net

This proposal supersedes a proposal from 2015-03-24.

Commit message

Don't handle multiple finished() signals

Description of the change

Don't handle multiple finished() signals

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-ui/browser-request.cpp'
2--- online-accounts-ui/browser-request.cpp 2014-10-09 12:24:45 +0000
3+++ online-accounts-ui/browser-request.cpp 2015-03-24 16:25:48 +0000
4@@ -264,6 +264,8 @@
5 Q_Q(BrowserRequest);
6
7 DEBUG() << "Browser dialog closed";
8+ QObject::disconnect(m_dialog, SIGNAL(finished(int)),
9+ this, SLOT(onFinished()));
10
11 QVariantMap reply;
12 QUrl url = m_responseUrl.isEmpty() ? m_currentUrl : m_responseUrl;

Subscribers

People subscribed via source and target branches