summaryrefslogtreecommitdiff
path: root/plugins/compiztoolbox
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 18:03:25 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 18:03:25 +0800
commitbe2474f212eebb7b1dc9457b7a4b373d1fd4fa58 (patch)
tree7753c00967cc43ebd158b5b4fc9787ba50fb1f87 /plugins/compiztoolbox
parent132f4c5c1344aba1d0f33bde343afaf3e651c1d7 (diff)
downloadcompiz-with-glib-mainloop-be2474f212eebb7b1dc9457b7a4b373d1fd4fa58.tar.gz
compiz-with-glib-mainloop-be2474f212eebb7b1dc9457b7a4b373d1fd4fa58.tar.bz2
Switcher: prevent simulataneous plugin uses that don't make sense.
Forward port 1974f9b5bfbab24023a0a647b606eedccbb83d04 to master
Diffstat (limited to 'plugins/compiztoolbox')
-rw-r--r--plugins/compiztoolbox/src/compiztoolbox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/compiztoolbox/src/compiztoolbox.cpp b/plugins/compiztoolbox/src/compiztoolbox.cpp
index 1ec4402..47f0288 100644
--- a/plugins/compiztoolbox/src/compiztoolbox.cpp
+++ b/plugins/compiztoolbox/src/compiztoolbox.cpp
@@ -397,7 +397,7 @@ BaseSwitchWindow::paintThumb (const GLWindowPaintAttrib &attrib,
int height2)
{
if (!openGLAvailable)
- return;
+ return;
GLWindowPaintAttrib sAttrib (attrib);
IconMode iconMode;
@@ -687,7 +687,7 @@ BaseSwitchScreen::BaseSwitchScreen (CompScreen *screen) :
selectWinAtom = PropertyWriter (CompString (DECOR_SWITCH_WINDOW_ATOM_NAME),
atomTemplate);
- selectFgColorAtom =
+ selectFgColorAtom =
XInternAtom (::screen->dpy (),
DECOR_SWITCH_FOREGROUND_COLOR_ATOM_NAME, 0);