Compiz

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

  1. compiz.fix_1046199.2
  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:~compiz-team/compiz/compiz.fix_1046199.2
Merge into: lp: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:~compiz-team/compiz/compiz.fix_1046199.2
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.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

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

LGTM

review: Approve
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/161/console reported an error when processing this lp:~compiz-team/compiz/compiz.fix_1046199.2 branch.
Not merging it.

Timo Jyrinki (timo-jyrinki) wrote :

Finished: SUCCESS

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml'
2--- compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2012-08-22 09:15:24 +0000
3+++ compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2012-09-05 10:08:29 +0000
4@@ -104,7 +104,7 @@
5 <default>["Disabled"]</default>
6 </key>
7 <key type="as" name="show-hud">
8- <default>["Alt"]</default>
9+ <default>["&lt;Alt&gt;"]</default>
10 </key>
11 </schema>
12 </schemalist>
13
14=== modified file 'gtk/gnome/50-compiz-launchers.xml.in'
15--- gtk/gnome/50-compiz-launchers.xml.in 2012-08-15 14:09:32 +0000
16+++ gtk/gnome/50-compiz-launchers.xml.in 2012-09-05 10:08:29 +0000
17@@ -1,6 +1,6 @@
18 <?xml version="1.0" encoding="UTF-8"?>
19 <KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Launchers" package="compiz">
20
21- <KeyListEntry name="exec" _description="Launch Terminal"/>
22+ <KeyListEntry name="run-command-terminal" _description="Launch Terminal"/>
23
24 </KeyListEntries>
25
26=== modified file 'postinst/convert-files/compiz-profile-Default.convert'
27--- postinst/convert-files/compiz-profile-Default.convert 2012-09-03 07:19:30 +0000
28+++ postinst/convert-files/compiz-profile-Default.convert 2012-09-05 10:08:29 +0000
29@@ -110,7 +110,7 @@
30
31
32 [org.compiz.integrated]
33-exec = /apps/metacity/global_keybindings/run_command_terminal
34+run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
35 run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
36 run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
37 panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
38
39=== modified file 'postinst/convert-files/compiz-profile-active-Default.convert'
40--- postinst/convert-files/compiz-profile-active-Default.convert 2012-09-03 07:19:30 +0000
41+++ postinst/convert-files/compiz-profile-active-Default.convert 2012-09-05 10:08:29 +0000
42@@ -110,7 +110,7 @@
43
44
45 [org.compiz.integrated]
46-exec = /apps/metacity/global_keybindings/run_command_terminal
47+run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
48 run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
49 run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
50 panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog

Subscribers

People subscribed via source and target branches