Merge lp:~compiz-team/compiz-core/compiz-core.fix_724093 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fixes window titles not showing up in the switcher and probably bug 724093 since the atk property was attached to the text property.

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
--- plugins/compiztoolbox/src/compiztoolbox.cpp	2011-03-14 16:12:45 +0000
+++ plugins/compiztoolbox/src/compiztoolbox.cpp	2011-09-09 15:06:40 +0000
@@ -129,10 +129,16 @@
     CompOption::Vector opts;
     CompOption::Value  v;
 
-    if (focus && selectedWindow && !selectedWindow->destroyed ())
+    if (selectedWindow && !selectedWindow->destroyed ())
     {
 	selectedWindowId = selectedWindow->id ();
-	selectedWindow->moveInputFocusTo ();
+
+	/* FIXME: Changing the input focus here will
+	 * screw up the ordering of windows in
+	 * the switcher, so we probably want to avoid that
+	 */
+	if (focus)
+	    selectedWindow->moveInputFocusTo ();
     }
 
     v = CompOption::Value ((int) selectedWindowId);