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

[Daniel d'Andrada]

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

Fixes https://code.launchpad.net/~dandrader/unity8/mirSurface/+merge/264920/comments/675029

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/240/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'src/ubuntumirclient/clipboard.cpp'
--- src/ubuntumirclient/clipboard.cpp	2014-09-23 11:49:03 +0000
+++ src/ubuntumirclient/clipboard.cpp	2015-08-20 15:40:22 +0000
@@ -266,6 +266,10 @@
 
 void UbuntuClipboard::setDBusClipboardContents(const QByteArray &clipboardContents)
 {
+    if (!mDBusSetupDone) {
+        setupDBus();
+    }
+
     if (!mPendingSetContentsCall.isNull()) {
         // Ignore any previous set call as we are going to overwrite it anyway
         QObject::disconnect(mPendingSetContentsCall.data(), 0, this, 0);