← Back to branch summary

~ci-train-bot/qtubuntu/qtubuntu-ubuntu-xenial-landing-005

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/clipboard.cpp

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2015-08-28 08:13:50 UTC
  • mfrom: (274.1.1 trunk)
  • Revision ID: ci-train-bot@canonical.com-20150828081350-zucuzpb2qvic1p59
UbuntuClipboard: ensure DBus has been set up before setting clipboard contents
Approved by: PS Jenkins bot, Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/clipboard.cpp
266
266
 
267
267
void UbuntuClipboard::setDBusClipboardContents(const QByteArray &clipboardContents)
268
268
{
 
269
    if (!mDBusSetupDone) {
 
270
        setupDBus();
 
271
    }
 
272
 
269
273
    if (!mPendingSetContentsCall.isNull()) {
270
274
        // Ignore any previous set call as we are going to overwrite it anyway
271
275
        QObject::disconnect(mPendingSetContentsCall.data(), 0, this, 0);