← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/compiztoolbox/src/compiztoolbox.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/compiztoolbox/src/compiztoolbox.cpp
29
29
#include <core/abiversion.h>
30
30
#include <core/propertywriter.h>
31
31
 
32
 
const unsigned short ICON_SIZE = 48;
33
 
const unsigned int MAX_ICON_SIZE = 256;
 
32
const unsigned short ICON_SIZE     = 512;
 
33
const unsigned short MAX_ICON_SIZE = 512;
34
34
 
35
35
bool openGLAvailable;
36
36
 
715
715
bool
716
716
CompizToolboxPluginVTable::init ()
717
717
{
718
 
    openGLAvailable = true;
719
 
 
720
 
    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
721
 
        return false;
722
 
 
723
 
    if (!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
724
 
        !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
 
718
    if (CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) &&
 
719
        CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
 
720
        openGLAvailable = true;
 
721
    else
725
722
        openGLAvailable = false;
726
723
 
727
 
    CompPrivate p;
728
 
    p.uval = COMPIZ_COMPIZTOOLBOX_ABI;
729
 
    screen->storeValue ("compiztoolbox_ABI", p);
 
724
    if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
 
725
    {
 
726
        CompPrivate p;
 
727
        p.uval = COMPIZ_COMPIZTOOLBOX_ABI;
 
728
        screen->storeValue ("compiztoolbox_ABI", p);
 
729
        return true;
 
730
    }
730
731
 
731
 
    return true;
 
732
    return false;
732
733
}
733
734
 
734
735
void