~mc-return/compiz/compiz.merge-fix1101446-and-1101618-and-other-improvements

Viewing all changes in revision 3755.

  • Committer: Tarmac
  • Author(s): Sami Jaktholm
  • Date: 2013-07-09 01:17:01 UTC
  • mfrom: (3753.2.1 fix-1131106)
  • Revision ID: tarmac-20130709011701-m3sty63fi5d6z33l
Expo plugin:
1) Always fetch the dndButton action in dndFini.

   The action given to dndFini might be a key or edge binding action if expo
   was terminated during window DnD. We shouldn't set their state to
   CompAction::StateInitButton or the bindings break.

2) Pass NULL action to termExpo if invoked from handleEvent

   Previously we passed the action of expoKey to termExpo which in turn passed
   it to dndFini. DndFini changed the action state to
   CompAction::StateInitButton that broke the keybinding.

   Now that dndFini fetches the dndButton action itself, there's no need to
   fetch it in handleEvent too as dndFini is the only one using the action. Fixes: https://bugs.launchpad.net/bugs/1131106.

Approved by PS Jenkins bot, MC Return.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: