← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to kdeui/windowmanagement/kwindowsystem_x11.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeui/windowmanagement/kwindowsystem_x11.cpp
689
689
    if ( miniIcon.isNull() )
690
690
        return;
691
691
    img = miniIcon.toImage().convertToFormat( QImage::Format_ARGB32 );
 
692
    if ( img.isNull() )
 
693
        return;
692
694
    ni.size.width = img.size().width();
693
695
    ni.size.height = img.size().height();
694
696
    ni.data = (unsigned char *) img.bits();