Merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.primary_control_mask into lp:compiz-libcompizconfig

Proposed by Sam Spilsbury on 2012-02-22
Status: Merged
Approved by: Didier Roche on 2012-02-22
Approved revision: 430
Merged at revision: 429
Proposed branch: lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.primary_control_mask
Merge into: lp:compiz-libcompizconfig
Diff against target: 34 lines (+10/-1)
3 files modified
NEWS (+8/-0)
VERSION (+1/-1)
src/bindings.c (+1/-0)
To merge this branch: bzr merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.primary_control_mask
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-02-22
Alan Griffiths 2012-02-22 Approve on 2012-02-22
Review via email: mp+94128@code.launchpad.net

Description of the change

GTK is stupid and uses Primary instead of Control, so allow Primary too, but convert it to ControlMask

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

Are the news updates showing in the diff related?

review: Approve
Didier Roche (didrocks) wrote :

works well, thanks for the workaround same :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2011-08-19 21:33:13 +0000
+++ NEWS 2012-02-22 11:35:04 +0000
@@ -1,3 +1,11 @@
1Release 0.9.7.1 ( 2012-01-26 smspillaz <sam.spilsbury@canonical.com> )
2=======================================================================
3
4 Fixes bugs:
5 - LP #872922 CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"
6 - LP #874842 Make upgrades be read from DATADIR and not SYSCONFDIR
7
8
1Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> ) 9Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> )
2============================================================================10============================================================================
3Development Release (0.9.5.92)11Development Release (0.9.5.92)
412
=== modified file 'VERSION'
--- VERSION 2011-08-19 21:33:13 +0000
+++ VERSION 2012-02-22 11:35:04 +0000
@@ -1,1 +1,1 @@
10.9.5.9410.9.7.1
22
=== modified file 'src/bindings.c'
--- src/bindings.c 2009-09-01 04:17:14 +0000
+++ src/bindings.c 2012-02-22 11:35:04 +0000
@@ -65,6 +65,7 @@
65modifierList[] = {65modifierList[] = {
66 { "<Shift>", ShiftMask },66 { "<Shift>", ShiftMask },
67 { "<Control>", ControlMask },67 { "<Control>", ControlMask },
68 { "<Primary>", ControlMask },
68 { "<Mod1>", Mod1Mask },69 { "<Mod1>", Mod1Mask },
69 { "<Mod2>", Mod2Mask },70 { "<Mod2>", Mod2Mask },
70 { "<Mod3>", Mod3Mask },71 { "<Mod3>", Mod3Mask },

Subscribers

People subscribed via source and target branches