Merge lp:~seb128/compiz/convert-fix-typos-1041631 into lp:compiz/0.9.8

Proposed by Sebastien Bacher on 2012-08-28
Status: Merged
Approved by: Sam Spilsbury on 2012-08-29
Approved revision: 3326
Merged at revision: 3326
Proposed branch: lp:~seb128/compiz/convert-fix-typos-1041631
Merge into: lp:compiz/0.9.8
Diff against target: 64 lines (+8/-8)
2 files modified
postinst/convert-files/compiz-profile-Default.convert (+4/-4)
postinst/convert-files/compiz-profile-active-Default.convert (+4/-4)
To merge this branch: bzr merge lp:~seb128/compiz/convert-fix-typos-1041631
Reviewer Review Type Date Requested Status
Sam Spilsbury 2012-08-28 Approve on 2012-08-29
Review via email: mp+121701@code.launchpad.net

Commit message

updated convert files to fix some typos in the key names

Description of the change

updated convert files to fix some typos in the key names

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

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'postinst/convert-files/compiz-profile-Default.convert'
2--- postinst/convert-files/compiz-profile-Default.convert 2012-08-16 15:34:03 +0000
3+++ postinst/convert-files/compiz-profile-Default.convert 2012-08-28 20:24:19 +0000
4@@ -2,7 +2,7 @@
5 active-plugins = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/active_plugins
6 vsize = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/vsize
7 hsize = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/vsize
8-close_window_button = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/close_window_button
9+close-window-button = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/close_window_button
10 close-window-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/close_window_key
11 lower-window-button = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/lower_window_button
12 lower-window-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/lower_window_key
13@@ -15,7 +15,7 @@
14 raise-window-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/raise_window_key
15 show-desktop-edge = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/show_desktop_edge
16 show-desktop-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/show_desktop_key
17-toggle-window_maximized-button = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/toggle_window_maximized_button
18+toggle-window-maximized-button = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/toggle_window_maximized_button
19 toggle-window-maximized-horizontally-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/toggle_window_maximized_horizontally_key
20 toggle-window-maximized-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/toggle_window_maximized_key
21 toggle-window-maximized-vertically-key = /apps/compizconfig-1/profiles/Default/plugins/core/screen0/options/toggle_window_maximized_vertically_key
22@@ -103,8 +103,8 @@
23 right-edge-threshold = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/right_edge_threshold
24 snapback-windows = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/snapback_windows
25 snapoff-maximized = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/snapoff_maximized
26-top-edge_action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_edge_action
27-top-edge_threshold = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_edge_threshold
28+top-edge-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_edge_action
29+top-edge-threshold = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_edge_threshold
30 top-left-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_left_corner_action
31 top-right-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_right_corner_action
32
33
34=== modified file 'postinst/convert-files/compiz-profile-active-Default.convert'
35--- postinst/convert-files/compiz-profile-active-Default.convert 2012-08-16 15:34:03 +0000
36+++ postinst/convert-files/compiz-profile-active-Default.convert 2012-08-28 20:24:19 +0000
37@@ -2,7 +2,7 @@
38 active-plugins = /apps/compiz-1/plugins/core/screen0/options/active_plugins
39 vsize = /apps/compiz-1/plugins/core/screen0/options/vsize
40 hsize = /apps/compiz-1/plugins/core/screen0/options/vsize
41-close_window_button = /apps/compiz-1/plugins/core/screen0/options/close_window_button
42+close-window-button = /apps/compiz-1/plugins/core/screen0/options/close_window_button
43 close-window-key = /apps/compiz-1/plugins/core/screen0/options/close_window_key
44 lower-window-button = /apps/compiz-1/plugins/core/screen0/options/lower_window_button
45 lower-window-key = /apps/compiz-1/plugins/core/screen0/options/lower_window_key
46@@ -15,7 +15,7 @@
47 raise-window-key = /apps/compiz-1/plugins/core/screen0/options/raise_window_key
48 show-desktop-edge = /apps/compiz-1/plugins/core/screen0/options/show_desktop_edge
49 show-desktop-key = /apps/compiz-1/plugins/core/screen0/options/show_desktop_key
50-toggle-window_maximized-button = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_button
51+toggle-window-maximized-button = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_button
52 toggle-window-maximized-horizontally-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_horizontally_key
53 toggle-window-maximized-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_key
54 toggle-window-maximized-vertically-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_vertically_key
55@@ -103,8 +103,8 @@
56 right-edge-threshold = /apps/compiz-1/plugins/grid/screen0/options/right_edge_threshold
57 snapback-windows = /apps/compiz-1/plugins/grid/screen0/options/snapback_windows
58 snapoff-maximized = /apps/compiz-1/plugins/grid/screen0/options/snapoff_maximized
59-top-edge_action = /apps/compiz-1/plugins/grid/screen0/options/top_edge_action
60-top-edge_threshold = /apps/compiz-1/plugins/grid/screen0/options/top_edge_threshold
61+top-edge-action = /apps/compiz-1/plugins/grid/screen0/options/top_edge_action
62+top-edge-threshold = /apps/compiz-1/plugins/grid/screen0/options/top_edge_threshold
63 top-left-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_left_corner_action
64 top-right-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_right_corner_action
65

Subscribers

People subscribed via source and target branches