Compiz

Merge lp://staging/~compiz-team/compiz/compiz.fix_1046199.2 into lp://staging/compiz/0.9.8

compiz.fix_1046199.2
Merge into 0.9.8

Proposed by Timo Jyrinki on 2012-09-05

Status:

Merged

Approved by:

Sam Spilsbury on 2012-09-05

Approved revision:

3337

Merged at revision:

3342

Proposed branch:

lp://staging/~compiz-team/compiz/compiz.fix_1046199.2

Merge into:

lp://staging/compiz/0.9.8

Diff against target:

50 lines (+4/-4)

4 files modified

compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+1/-1)
gtk/gnome/50-compiz-launchers.xml.in (+1/-1)
postinst/convert-files/compiz-profile-Default.convert (+1/-1)
postinst/convert-files/compiz-profile-active-Default.convert (+1/-1)

To merge this branch:

bzr merge lp://staging/~compiz-team/compiz/compiz.fix_1046199.2

Related bugs:

Bug #1040081: [regression] Week 34: Ctrl+Alt+T shortcut (open terminal) fails to work	High	Fix Released
Bug #1046190: Migration to gsettings doesn't migrate compiz/unity configurable keys to g-c-c and those keys doesn't work	High	Fix Released
Bug #1046199: Changing a key to org.compiz.integrated schema doesn't impact the current profile	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Approve on 2012-09-05
Sam Spilsbury		2012-09-05	Approve on 2012-09-05
Review via email: mp+122833@code.staging.launchpad.net

Commit message

Partial fix to LP: #1046199 / LP: #1046190 fixing launch terminal functionality and making show-hud default key visible.

Description of the change

Related to bug 1046199 / bug 1046190 a partial fix. Fixes the org.compiz.integrated launch terminal binding to become functional and the show-hud default to be correctly written so that the default becomes visible in keybindings.

Works in co-operation with lp:~compiz-team/compiz/compiz.fix_1046199.1

Revision history for this message