← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

« back to all changes in this revision

Viewing changes to plugins/kdecompat/src/kdecompat.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-22 06:58:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3352.
  • Revision ID: package-import@ubuntu.com-20130822065807-17nlzez0d30y09so
Tags: upstream-0.9.10+13.10.20130822
Import upstream version 0.9.10+13.10.20130822

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/kdecompat/src/kdecompat.cpp
288
288
        }
289
289
        else
290
290
        {
291
 
            icon = gWindow->getIcon (256, 256);
 
291
            icon = gWindow->getIcon (512, 512);
292
292
            if (!icon)
293
293
                icon = ks->gScreen->defaultIcon ();
294
294
 
955
955
bool
956
956
KDECompatPluginVTable::init ()
957
957
{
958
 
    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
959
 
        !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
960
 
        !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
961
 
        return false;
 
958
    if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)            &&
 
959
        CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)  &&
 
960
        CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
 
961
        return true;
962
962
 
963
 
    return true;
 
963
    return false;
964
964
}