Unity

Merge lp:~mc-return/unity/unity.merge-fix1115128-gconf-problems into lp:unity

  1. unity.merge-fix1115128-gconf-problems
  2. Merge into trunk
Proposed by MC Return
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 3118
Proposed branch: lp:~mc-return/unity/unity.merge-fix1115128-gconf-problems
Merge into: lp:unity
Diff against target: 24 lines (+2/-2)
2 files modified
tools/convert-files/compiz-profile-active-unity.convert (+1/-1)
tools/convert-files/compiz-profile-unity.convert (+1/-1)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix1115128-gconf-problems
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+146419@code.launchpad.net

Commit message

Use unmaximize-window-key instead unmaximize-or-minimize-window-key in
compiz-profile-unity.convert and compiz-profile-active-unity.convert.

(LP: #1115128)

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks for making the change!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/convert-files/compiz-profile-active-unity.convert'
2--- tools/convert-files/compiz-profile-active-unity.convert 2013-01-29 19:48:36 +0000
3+++ tools/convert-files/compiz-profile-active-unity.convert 2013-02-04 14:18:27 +0000
4@@ -70,7 +70,7 @@
5 toggle-window-maximized-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_key
6 toggle-window-maximized-vertically-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_vertically_key
7 toggle-window-shaded-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_shaded_key
8-unmaximize-or-minimize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_or_minimize_window_key
9+unmaximize-window-key = /apps/compiz-1/plugins/core/screen0/options/unmaximize_window_key
10 window-menu-button = /apps/compiz-1/plugins/core/screen0/options/window_menu_button
11 window-menu-key = /apps/compiz-1/plugins/core/screen0/options/window_menu_key
12
13
14=== modified file 'tools/convert-files/compiz-profile-unity.convert'
15--- tools/convert-files/compiz-profile-unity.convert 2013-01-29 19:48:36 +0000
16+++ tools/convert-files/compiz-profile-unity.convert 2013-02-04 14:18:27 +0000
17@@ -70,7 +70,7 @@
18 toggle-window-maximized-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_key
19 toggle-window-maximized-vertically-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_vertically_key
20 toggle-window-shaded-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_shaded_key
21-unmaximize-or-minimize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_or_minimize_window_key
22+unmaximize-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/unmaximize_window_key
23 window-menu-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/window_menu_button
24 window-menu-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/window_menu_key
25