Compiz Configuration Library

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
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

1=== modified file 'NEWS'
2--- NEWS 2011-08-19 21:33:13 +0000
3+++ NEWS 2012-02-22 11:35:04 +0000
4@@ -1,3 +1,11 @@
5+Release 0.9.7.1 ( 2012-01-26 smspillaz <sam.spilsbury@canonical.com> )
6+=======================================================================
7+
8+ Fixes bugs:
9+ - LP #872922 CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"
10+ - LP #874842 Make upgrades be read from DATADIR and not SYSCONFDIR
11+
12+
13 Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> )
14 ============================================================================
15 Development Release (0.9.5.92)
16
17=== modified file 'VERSION'
18--- VERSION 2011-08-19 21:33:13 +0000
19+++ VERSION 2012-02-22 11:35:04 +0000
20@@ -1,1 +1,1 @@
21-0.9.5.94
22+0.9.7.1
23
24=== modified file 'src/bindings.c'
25--- src/bindings.c 2009-09-01 04:17:14 +0000
26+++ src/bindings.c 2012-02-22 11:35:04 +0000
27@@ -65,6 +65,7 @@
28 modifierList[] = {
29 { "<Shift>", ShiftMask },
30 { "<Control>", ControlMask },
31+ { "<Primary>", ControlMask },
32 { "<Mod1>", Mod1Mask },
33 { "<Mod2>", Mod2Mask },
34 { "<Mod3>", Mod3Mask },

Subscribers

People subscribed via source and target branches