~vanvugt/compiz/fix-1067218

Viewing all changes in revision 3413.

  • Committer: Tarmac
  • Author(s): Sam Spilsbury
  • Date: 2012-10-11 02:33:39 UTC
  • mfrom: (3405.5.3 compiz.fix_1058577)
  • Revision ID: tarmac-20121011023339-bnlrd8tv22tqvn6v
Added tests for the StringToModifiers and ModifiersToString code, move the
code which detects <Primary> as ControlMask upstream and use two functions to
ensure that duplicates aren't added.

Fixes Jenkins failures. (LP: #1058577). Fixes: https://bugs.launchpad.net/bugs/936840, https://bugs.launchpad.net/bugs/1058577. Approved by Daniel van Vugt, Sam Spilsbury.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: