=== modified file 'plugins/opacify/src/opacify.cpp'
--- plugins/opacify/src/opacify.cpp	2013-06-10 08:41:39 +0000
+++ plugins/opacify/src/opacify.cpp	2013-11-20 04:26:22 +0000
@@ -33,13 +33,13 @@
 void
 setFunctions (bool enabled)
 {
-    OPACIFY_SCREEN (screen);
+    OpacifyScreen *os = OpacifyScreen::get (screen);

     screen->handleEventSetEnabled (os, os->isToggle);

     foreach (CompWindow *w, screen->windows ())
     {
-	OPACIFY_WINDOW (w);
+	OpacifyWindow *ow = OpacifyWindow::get (w);

 	ow->gWindow->glPaintSetEnabled (ow, enabled);
     }
@@ -71,8 +71,7 @@
     if (!w)
 	return;

-    OPACIFY_WINDOW (w);
-
+    OpacifyWindow *ow = OpacifyWindow::get (w);
     ow->opacified = false;
     ow->cWindow->addDamage ();
 }
@@ -107,7 +106,7 @@
 	if (!win)
 	    continue;

-	OPACIFY_WINDOW (win);
+	OpacifyWindow *ow = OpacifyWindow::get (win);

 	ow->setOpacity (std::max (targetOpacity,
 				  ow->gWindow->paintAttrib ().opacity));
@@ -123,7 +122,7 @@
 void
 OpacifyWindow::dim ()
 {
-    OPACIFY_SCREEN (screen);
+    OpacifyScreen *os = OpacifyScreen::get (screen);

     os->passive.push_back (window->id ());

@@ -185,7 +184,7 @@
 void
 OpacifyWindow::handleEnter ()
 {
-    OPACIFY_SCREEN (screen);
+    OpacifyScreen *os = OpacifyScreen::get (screen);

     if (screen->otherGrabExist (NULL))
     {