qtubuntu

Merge lp:~dandrader/qtubuntu/ensureDBusClipboardReady into lp:qtubuntu

  1. ensureDBusClipboardReady
  2. Merge into trunk
Proposed by Daniel d'Andrada on 2015-08-20
Status: Merged
Approved by: Gerry Boland on 2015-08-27
Approved revision: 275
Merged at revision: 275
Proposed branch: lp:~dandrader/qtubuntu/ensureDBusClipboardReady
Merge into: lp:qtubuntu
Diff against target: 14 lines (+4/-0)
1 file modified
src/ubuntumirclient/clipboard.cpp (+4/-0)
To merge this branch: bzr merge lp:~dandrader/qtubuntu/ensureDBusClipboardReady
Reviewer Review Type Date Requested Status
Gerry Boland 2015-08-20 Approve on 2015-08-27
PS Jenkins bot continuous-integration Approve on 2015-08-20
Review via email: mp+268612@code.launchpad.net

Commit Message

UbuntuClipboard: ensure DBus has been set up before setting clipboard contents

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/clipboard.cpp'
2--- src/ubuntumirclient/clipboard.cpp 2014-09-23 11:49:03 +0000
3+++ src/ubuntumirclient/clipboard.cpp 2015-08-20 15:40:22 +0000
4@@ -266,6 +266,10 @@
5
6 void UbuntuClipboard::setDBusClipboardContents(const QByteArray &clipboardContents)
7 {
8+ if (!mDBusSetupDone) {
9+ setupDBus();
10+ }
11+
12 if (!mPendingSetContentsCall.isNull()) {
13 // Ignore any previous set call as we are going to overwrite it anyway
14 QObject::disconnect(mPendingSetContentsCall.data(), 0, this, 0);

Subscribers

People subscribed via source and target branches