~gerboland/qtubuntu/enable-debug-mode

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/window.cpp

  • Committer: Gerry Boland
  • Date: 2016-06-24 12:36:24 UTC
  • Revision ID: gerry.boland@canonical.com-20160624123624-bdm13kd840xyyezz
Fix up some bad merge decisions, and bump copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
581
581
    // D-Bus.
582
582
    // Therefore let's ensure we are up to date with the system clipboard now that we are getting
583
583
    // focused again.
584
 
    static_cast<UbuntuClipboard*>(mIntegration->clipboard())->requestDBusClipboardContents();
 
584
    mClipboard->requestDBusClipboardContents();
585
585
}
586
586
 
587
587
void UbuntuWindow::handleSurfaceVisibilityChanged(bool visible)