Merge compiz:panel-focus into compiz:master

[Alberts Muktupāvels]

event: use correct window when deciding if it should appear focused

diff --git a/src/event.cpp b/src/event.cpp
index 82fd49e..9e67a9e 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -2277,7 +2277,7 @@ static const unsigned short _NET_WM_STATE_TOGGLE = 2;
 				}
 			    }
 
-			    active->changeState (active->focused () || (w->type () & APPEARS_FOCUSED_MASK) ?
+			    active->changeState (active->focused () || (active->type () & APPEARS_FOCUSED_MASK) ?
 						 active->state () | CompWindowStateFocusedMask :
 						 active->state () & ~CompWindowStateFocusedMask);