Merge lp:~vanvugt/unity/fix-960957 into lp:unity

[Daniel van Vugt]

Don't respond to "Confirm" actions in showLauncherKeyTerminate, which come
from pressing Enter during any action (holding Alt). Those calls are spurious
(a long-standing design bug in compiz) and do not come with a valid options[]
vector. So accessing options[] would crash (LP: #960957)

[Gord Allott (gordallott)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for the fix, it works well! ;)

review: Approve

=== modified file 'manual-tests/AltCombos.txt'
--- manual-tests/AltCombos.txt	2012-03-14 09:15:45 +0000
+++ manual-tests/AltCombos.txt	2012-03-21 10:12:38 +0000
@@ -8,3 +8,13 @@
 
 Outcome
   The terminal should show the keycodes were received as text "ABCD".
+
+
+Alt+Enter Crash
+---------------
+Tests that Alt+Enter does not cause unity to crash (LP: #960957)
+
+#. Press Alt+Enter.
+
+Outcome
+  Unity/compiz should not crash.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-20 15:37:36 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-21 10:12:38 +0000
@@ -1577,6 +1577,11 @@
                                            CompAction::State state,
                                            CompOption::Vector& options)
 {
+  // Remember StateCancel and StateCommit will be broadcast to all actions
+  // so we need to verify that we are actually being toggled...
+  if (!(state & CompAction::StateTermKey))
+    return false;
+
   if (state & CompAction::StateCancel)
     return false;