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

Proposed by Sebastien Bacher on 2012-08-28
Status: Merged
Approved by: Timo Jyrinki on 2012-08-29
Approved revision: 2636
Merged at revision: 2637
Proposed branch: lp:~seb128/unity/convert-typos-fix-1041631
Merge into: lp:unity
Diff against target: 111 lines (+14/-16)
2 files modified
tools/convert-files/compiz-profile-active-unity.convert (+7/-8)
tools/convert-files/compiz-profile-unity.convert (+7/-8)
To merge this branch: bzr merge lp:~seb128/unity/convert-typos-fix-1041631
Reviewer Review Type Date Requested Status
Timo Jyrinki 2012-08-28 Approve on 2012-08-29
Review via email: mp+121696@code.launchpad.net

Commit message

updated the convert files to fix some typos in the key names

Description of the change

updated the convert files to fix some typos in the key names

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Looks good.

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 2012-07-20 16:32:58 +0000
3+++ tools/convert-files/compiz-profile-active-unity.convert 2012-08-28 20:14:17 +0000
4@@ -23,7 +23,7 @@
5 decay-rate = /apps/compiz-1/plugins/unityshell/screen0/options/decay_rate
6 stop-velocity = /apps/compiz-1/plugins/unityshell/screen0/options/stop_velocity
7 autohide-animation = /apps/compiz-1/plugins/unityshell/screen0/options/autohide_animation
8-alt-tab-bias_viewport = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_bias_viewport
9+alt-tab-bias-viewport = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_bias_viewport
10 edge-responsiveness = /apps/compiz-1/plugins/unityshell/screen0/options/edge_responsiveness
11 automaximize-value = /apps/compiz-1/plugins/unityshell/screen0/options/automaximize_value
12 background-color = /apps/compiz-1/plugins/unityshell/screen0/options/background_color
13@@ -36,11 +36,11 @@
14 alt-tab-prev-window = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_prev_window
15 devices-option = /apps/compiz-1/plugins/unityshell/screen0/options/devices_option
16 reveal-trigger = /apps/compiz-1/plugins/unityshell/screen0/options/reveal_trigger
17-panel-first_menu = /apps/compiz-1/plugins/unityshell/screen0/options/panel_first_menu
18+panel-first-menu = /apps/compiz-1/plugins/unityshell/screen0/options/panel_first_menu
19 icon-size = /apps/compiz-1/plugins/unityshell/screen0/options/icon_size
20 backlight-mode = /apps/compiz-1/plugins/unityshell/screen0/options/backlight_mode
21 menus-fadein = /apps/compiz-1/plugins/unityshell/screen0/options/menus_fadein
22-alt-tab-detail_start = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_detail_start
23+alt-tab-detail-start = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_detail_start
24 show-desktop-icon = /apps/compiz-1/plugins/unityshell/screen0/options/show_desktop_icon
25 alt-tab-next-window = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_next_window
26 launcher-opacity = /apps/compiz-1/plugins/unityshell/screen0/options/launcher_opacity
27@@ -53,7 +53,7 @@
28 active-plugins = /apps/compiz-1/plugins/core/screen0/options/active_plugins
29 vsize = /apps/compiz-1/plugins/core/screen0/options/vsize
30 hsize = /apps/compiz-1/plugins/core/screen0/options/vsize
31-close_window_button = /apps/compiz-1/plugins/core/screen0/options/close_window_button
32+close-window-button = /apps/compiz-1/plugins/core/screen0/options/close_window_button
33 close-window-key = /apps/compiz-1/plugins/core/screen0/options/close_window_key
34 lower-window-button = /apps/compiz-1/plugins/core/screen0/options/lower_window_button
35 lower-window-key = /apps/compiz-1/plugins/core/screen0/options/lower_window_key
36@@ -66,7 +66,7 @@
37 raise-window-key = /apps/compiz-1/plugins/core/screen0/options/raise_window_key
38 show-desktop-edge = /apps/compiz-1/plugins/core/screen0/options/show_desktop_edge
39 show-desktop-key = /apps/compiz-1/plugins/core/screen0/options/show_desktop_key
40-toggle-window_maximized-button = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_button
41+toggle-window-maximized-button = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_button
42 toggle-window-maximized-horizontally-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_horizontally_key
43 toggle-window-maximized-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_key
44 toggle-window-maximized-vertically-key = /apps/compiz-1/plugins/core/screen0/options/toggle_window_maximized_vertically_key
45@@ -154,8 +154,7 @@
46 right-edge-threshold = /apps/compiz-1/plugins/grid/screen0/options/right_edge_threshold
47 snapback-windows = /apps/compiz-1/plugins/grid/screen0/options/snapback_windows
48 snapoff-maximized = /apps/compiz-1/plugins/grid/screen0/options/snapoff_maximized
49-top-edge_action = /apps/compiz-1/plugins/grid/screen0/options/top_edge_action
50-top-edge_threshold = /apps/compiz-1/plugins/grid/screen0/options/top_edge_threshold
51+top-edge-action = /apps/compiz-1/plugins/grid/screen0/options/top_edge_action
52+top-edge-threshold = /apps/compiz-1/plugins/grid/screen0/options/top_edge_threshold
53 top-left-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_left_corner_action
54 top-right-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_right_corner_action
55-
56
57=== modified file 'tools/convert-files/compiz-profile-unity.convert'
58--- tools/convert-files/compiz-profile-unity.convert 2012-07-20 16:32:58 +0000
59+++ tools/convert-files/compiz-profile-unity.convert 2012-08-28 20:14:17 +0000
60@@ -23,7 +23,7 @@
61 decay-rate = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/decay_rate
62 stop-velocity = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/stop_velocity
63 autohide-animation = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/autohide_animation
64-alt-tab-bias_viewport = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_bias_viewport
65+alt-tab-bias-viewport = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_bias_viewport
66 edge-responsiveness = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/edge_responsiveness
67 automaximize-value = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/automaximize_value
68 background-color = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/background_color
69@@ -36,11 +36,11 @@
70 alt-tab-prev-window = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_prev_window
71 devices-option = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/devices_option
72 reveal-trigger = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/reveal_trigger
73-panel-first_menu = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/panel_first_menu
74+panel-first-menu = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/panel_first_menu
75 icon-size = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/icon_size
76 backlight-mode = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/backlight_mode
77 menus-fadein = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/menus_fadein
78-alt-tab-detail_start = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_detail_start
79+alt-tab-detail-start = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_detail_start
80 show-desktop-icon = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/show_desktop_icon
81 alt-tab-next-window = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_next_window
82 launcher-opacity = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/launcher_opacity
83@@ -53,7 +53,7 @@
84 active-plugins = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/active_plugins
85 vsize = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/vsize
86 hsize = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/vsize
87-close_window_button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/close_window_button
88+close-window-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/close_window_button
89 close-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/close_window_key
90 lower-window-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/lower_window_button
91 lower-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/lower_window_key
92@@ -66,7 +66,7 @@
93 raise-window-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/raise_window_key
94 show-desktop-edge = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/show_desktop_edge
95 show-desktop-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/show_desktop_key
96-toggle-window_maximized-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_button
97+toggle-window-maximized-button = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_button
98 toggle-window-maximized-horizontally-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_horizontally_key
99 toggle-window-maximized-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_key
100 toggle-window-maximized-vertically-key = /apps/compizconfig-1/profiles/unity/plugins/core/screen0/options/toggle_window_maximized_vertically_key
101@@ -154,8 +154,7 @@
102 right-edge-threshold = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/right_edge_threshold
103 snapback-windows = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/snapback_windows
104 snapoff-maximized = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/snapoff_maximized
105-top-edge_action = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_edge_action
106-top-edge_threshold = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_edge_threshold
107+top-edge-action = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_edge_action
108+top-edge-threshold = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_edge_threshold
109 top-left-corner-action = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_left_corner_action
110 top-right-corner-action = /apps/compizconfig-1/profiles/unity/plugins/grid/screen0/options/top_right_corner_action
111-