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

[Timo Jyrinki]

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

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

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3337
http://jenkins.qa.ubuntu.com/job/compiz-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/21/console

review: Approve (continuous-integration)

[Unity Merger (unity-merger)]

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

Finished: SUCCESS

=== modified file 'compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml'
--- compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml	2012-08-22 09:15:24 +0000
+++ compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml	2012-09-05 10:08:29 +0000
@@ -104,7 +104,7 @@
 	    <default>["Disabled"]</default>
 	</key>
 	<key type="as" name="show-hud">
-	    <default>["Alt"]</default>
+	    <default>["&lt;Alt&gt;"]</default>
 	</key>
     </schema>
 </schemalist>
 
=== modified file 'gtk/gnome/50-compiz-launchers.xml.in'
--- gtk/gnome/50-compiz-launchers.xml.in	2012-08-15 14:09:32 +0000
+++ gtk/gnome/50-compiz-launchers.xml.in	2012-09-05 10:08:29 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Launchers" package="compiz">
 
-	<KeyListEntry name="exec" _description="Launch Terminal"/>
+	<KeyListEntry name="run-command-terminal" _description="Launch Terminal"/>
 
 </KeyListEntries>
 
=== modified file 'postinst/convert-files/compiz-profile-Default.convert'
--- postinst/convert-files/compiz-profile-Default.convert	2012-09-03 07:19:30 +0000
+++ postinst/convert-files/compiz-profile-Default.convert	2012-09-05 10:08:29 +0000
@@ -110,7 +110,7 @@
 
 
 [org.compiz.integrated]
-exec = /apps/metacity/global_keybindings/run_command_terminal
+run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
 run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
 run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
 panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
 
=== modified file 'postinst/convert-files/compiz-profile-active-Default.convert'
--- postinst/convert-files/compiz-profile-active-Default.convert	2012-09-03 07:19:30 +0000
+++ postinst/convert-files/compiz-profile-active-Default.convert	2012-09-05 10:08:29 +0000
@@ -110,7 +110,7 @@
 
 
 [org.compiz.integrated]
-exec = /apps/metacity/global_keybindings/run_command_terminal
+run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
 run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
 run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
 panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog