Unity

Merge lp:~seb128/unity/convert-deprecated-keys into lp:unity

  1. convert-deprecated-keys
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 2773
Proposed branch: lp:~seb128/unity/convert-deprecated-keys
Merge into: lp:unity
Diff against target: 23 lines (+0/-2)
2 files modified
tools/convert-files/compiz-profile-active-unity.convert (+0/-1)
tools/convert-files/compiz-profile-unity.convert (+0/-1)
To merge this branch: bzr merge lp:~seb128/unity/convert-deprecated-keys
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+127282@code.launchpad.net

Commit message

Don't convert "devices-option", it's a deprecated key

Description of the change

Don't convert "devices-option", it's a deprecated key

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

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-08-28 20:08:50 +0000
3+++ tools/convert-files/compiz-profile-active-unity.convert 2012-10-01 13:49:51 +0000
4@@ -34,7 +34,6 @@
5 dash-blur-experimental = /apps/compiz-1/plugins/unityshell/screen0/options/dash_blur_experimental
6 menus-discovery-duration = /apps/compiz-1/plugins/unityshell/screen0/options/menus_discovery_duration
7 alt-tab-prev-window = /apps/compiz-1/plugins/unityshell/screen0/options/alt_tab_prev_window
8-devices-option = /apps/compiz-1/plugins/unityshell/screen0/options/devices_option
9 reveal-trigger = /apps/compiz-1/plugins/unityshell/screen0/options/reveal_trigger
10 panel-first-menu = /apps/compiz-1/plugins/unityshell/screen0/options/panel_first_menu
11 icon-size = /apps/compiz-1/plugins/unityshell/screen0/options/icon_size
12
13=== modified file 'tools/convert-files/compiz-profile-unity.convert'
14--- tools/convert-files/compiz-profile-unity.convert 2012-08-28 20:08:50 +0000
15+++ tools/convert-files/compiz-profile-unity.convert 2012-10-01 13:49:51 +0000
16@@ -34,7 +34,6 @@
17 dash-blur-experimental = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/dash_blur_experimental
18 menus-discovery-duration = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/menus_discovery_duration
19 alt-tab-prev-window = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/alt_tab_prev_window
20-devices-option = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/devices_option
21 reveal-trigger = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/reveal_trigger
22 panel-first-menu = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/panel_first_menu
23 icon-size = /apps/compizconfig-1/profiles/unity/plugins/unityshell/screen0/options/icon_size