Merge lp:~codygarver/elementaryos/pantheon-xsession-settings-fix-993044 into lp:~elementary-os/elementaryos/pantheon-xsession-settings-luna

Proposed by Cody Garver
Status: Merged
Approved by: Sergey "Shnatsel" Davidoff
Approved revision: 50
Merged at revision: 53
Proposed branch: lp:~codygarver/elementaryos/pantheon-xsession-settings-fix-993044
Merge into: lp:~elementary-os/elementaryos/pantheon-xsession-settings-luna
Diff against target: 13 lines (+2/-2)
1 file modified
gconf/pantheon/default/20_pantheon-gconf-default (+2/-2)
To merge this branch: bzr merge lp:~codygarver/elementaryos/pantheon-xsession-settings-fix-993044
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+114051@code.launchpad.net

Description of the change

Merge this once lp:~codygarver/slingshot/fix-993044 gets merged.

After, make sure these branches get merged:

lp:~codygarver/wingpanel/fix-993044

lp:~codygarver/cerbere/fix-993044

To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Looks good. Don't forget to flip it in Gala defaults too, that's where all the cool stuff happens. This thing is really really rudimentary.

Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gconf/pantheon/default/20_pantheon-gconf-default'
2--- gconf/pantheon/default/20_pantheon-gconf-default 2012-06-01 19:20:03 +0000
3+++ gconf/pantheon/default/20_pantheon-gconf-default 2012-07-09 21:30:35 +0000
4@@ -2,6 +2,6 @@
5 /apps/metacity/general/auto_maximize_windows false
6 /apps/metacity/general/capture_before_unmap true
7 /apps/metacity/global_keybindings/run_command_1 "<Super>space"
8-/apps/metacity/keybinding_commands/command_1 "slingshot"
9+/apps/metacity/keybinding_commands/command_1 "slingshot-launcher"
10 /apps/metacity/general/compositing_manager true
11-/apps/metacity/general/compositor_effects false
12\ No newline at end of file
13+/apps/metacity/general/compositor_effects false

Subscribers

People subscribed via source and target branches

to all changes: