~ubuntu-branches/ubuntu/precise/unity-2d/precise-updates

« back to all changes in this revision

Viewing changes to panel/applets/legacytray/x11embedcontainer.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-01-24 14:11:16 UTC
  • Revision ID: package-import@ubuntu.com-20120124141116-p04af24z0nsnoe55
Tags: 5.2.0-0ubuntu2
* debian/control: Fix Vcs-Bzr: to point to precise/trunk branch.
* data/unity-2d.convert: Drop invalid "use-strut". This gsettings key does
  not exist and causes gsettings-data-convert to crash, making the whole
  settings migration fail. This cleans up after r804. (LP: #920894)
* debian/source/format: Move back to 1.0, as we have inline code changes
  with the full code being branched from trunk. Current dpkg makes it
  impossible to build a source package with 3.0 now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
252
252
    }
253
253
}
254
254
 
255
 
void X11EmbedContainer::setBackgroundPixmap(QPixmap background)
 
255
void X11EmbedContainer::setBackgroundPixmap(const QPixmap& background)
256
256
{
257
257
    if (!clientWinId()) {
258
258
        return;