diff -u compiz-0.8.4/debian/changelog compiz-0.8.4/debian/changelog
--- compiz-0.8.4/debian/changelog
+++ compiz-0.8.4/debian/changelog
@@ -1,3 +1,10 @@
+compiz (1:0.8.4-0ubuntu16) lucid-proposed; urgency=low
+
+  * Upstream patch, 438868_Dont-grant-override_redirect-windows-focus,
+    from 0.8.8 branch; (LP: #438868)
+
+ -- K Vishnoo Charan Reddy <vish@ubuntu.com>  Sat, 02 Apr 2011 21:34:58 +0530
+
 compiz (1:0.8.4-0ubuntu15) lucid; urgency=low
 
   * debian/patches/060_move_checks_to_compiz.patch:
diff -u compiz-0.8.4/debian/patches/series compiz-0.8.4/debian/patches/series
--- compiz-0.8.4/debian/patches/series
+++ compiz-0.8.4/debian/patches/series
@@ -22,0 +23 @@
+438868_Dont-grant-override_redirect-windows-focus.patch
only in patch2:
unchanged:
--- compiz-0.8.4.orig/debian/patches/438868_Dont-grant-override_redirect-windows-focus.patch
+++ compiz-0.8.4/debian/patches/438868_Dont-grant-override_redirect-windows-focus.patch
@@ -0,0 +1,24 @@
+From 30a92d8a060d79181a28840d7c66428ef431200c Mon Sep 17 00:00:00 2001
+From: Danny Baumann <dannybaumann@web.de>
+Date: Thu, 17 Mar 2011 07:17:28 +0000
+Subject: Don't grant focus to override_redirect windows.
+
+Most other window managers don't even track override_redirect windows,
+so applications relying on the focus being granted to override_redirect
+windows are broken anyway.
+---
+diff --git a/src/event.c b/src/event.c
+index 97c449c..c565c59 100644
+--- a/src/event.c
++++ b/src/event.c
+@@ -1692,7 +1692,7 @@ handleEvent (CompDisplay *d,
+     case ClientMessage:
+ 	if (event->xclient.message_type == d->winActiveAtom)
+ 	{
+-	    w = findWindowAtDisplay (d, event->xclient.window);
++	    w = findTopLevelWindowAtDisplay (d, event->xclient.window);
+ 	    if (w)
+ 	    {
+ 		CompFocusResult focus = CompFocusAllowed;
+--
+cgit v0.8.3.1-30-gff3a