Compiz

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

  1. compiz.fix_1046199.1
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Approved by: Martin Mrazik
Approved revision: 3336
Merged at revision: 3344
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1046199.1
Merge into: lp:compiz/0.9.8
Diff against target: 53 lines (+10/-10)
1 file modified
compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+10/-10)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1046199.1
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Daniel van Vugt Needs Information
Timo Jyrinki Approve
Review via email: mp+122814@code.launchpad.net

Commit message

Update the defaults to org.compiz.integrated to reflect the actual gnome values pre-gnome-3

Description of the change

Update the defaults to org.compiz.integrated to reflect the actual gnome values pre-gnome-3

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks related to bug 1040081. Should we list compiz in bug 1040081?

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Needs Information
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Yep done.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

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

review: Approve (continuous-integration)
Revision history for this message
Unity Merger (unity-merger) wrote :

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Jenkins is again erroring about a "Finished: SUCCESS" build...

Revision history for this message
Unity Merger (unity-merger) wrote :

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

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 08:50:34 +0000
4@@ -2,19 +2,19 @@
5 <schemalist>
6 <schema path="/org/compiz/integrated/" id="org.compiz.integrated">
7 <key type="b" name="display-all-workspaces">
8- <default>false</default>
9+ <default>true</default>
10 </key>
11 <key type="s" name="exec">
12- <default>""</default>
13+ <default>"gnome-terminal"</default>
14 </key>
15 <key type="s" name="command-window-screenshot">
16- <default>""</default>
17+ <default>"gnome-screenshot -w"</default>
18 </key>
19 <key type="s" name="command-screenshot">
20- <default>""</default>
21+ <default>"gnome-screenshot"</default>
22 </key>
23 <key type="s" name="command-terminal">
24- <default>""</default>
25+ <default>"gnome-terminal"</default>
26 </key>
27 <key type="as" name="run-command-12">
28 <default>["Disabled"]</default>
29@@ -89,19 +89,19 @@
30 <default>""</default>
31 </key>
32 <key type="as" name="run-command-terminal">
33- <default>["Disabled"]</default>
34+ <default>["&lt;Control&gt;&lt;Alt&gt;t"]</default>
35 </key>
36 <key type="as" name="run-command-window-screenshot">
37- <default>["Disabled"]</default>
38+ <default>["&lt;Alt&gt;Print"]</default>
39 </key>
40 <key type="as" name="run-command-screenshot">
41- <default>["Disabled"]</default>
42+ <default>["Print"]</default>
43 </key>
44 <key type="as" name="panel-main-menu">
45- <default>["Disabled"]</default>
46+ <default>["&lt;Alt&gt;F1"]</default>
47 </key>
48 <key type="as" name="panel-run-dialog">
49- <default>["Disabled"]</default>
50+ <default>["&lt;Alt&gt;F2"]</default>
51 </key>
52 <key type="as" name="show-hud">
53 <default>["Alt"]</default>

Subscribers

People subscribed via source and target branches