Unity

Merge lp:~didrocks/unity/launcher-lock into lp:unity

  1. launcher-lock
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 1929
Proposed branch: lp:~didrocks/unity/launcher-lock
Merge into: lp:unity
Diff against target: 19 lines (+2/-2)
1 file modified
plugins/unityshell/src/LauncherOptions.cpp (+2/-2)
To merge this branch: bzr merge lp:~didrocks/unity/launcher-lock
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+91850@code.launchpad.net

Description of the change

Add initialization for default value

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

Looks good to me.

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

(do not forget to change the merge status :))

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/LauncherOptions.cpp'
--- plugins/unityshell/src/LauncherOptions.cpp 2012-02-01 00:06:29 +0000
+++ plugins/unityshell/src/LauncherOptions.cpp 2012-02-07 15:33:20 +0000
@@ -36,7 +36,7 @@
36 edge_responsiveness = 1.0f;36 edge_responsiveness = 1.0f;
37 edge_reveal_pressure = 2000;37 edge_reveal_pressure = 2000;
38 edge_stop_velocity = 4500;38 edge_stop_velocity = 4500;
39 hide_mode = LAUNCHER_HIDE_DODGE_WINDOWS;39 hide_mode = LAUNCHER_HIDE_NEVER;
40 icon_size = 48;40 icon_size = 48;
41 launch_animation = LAUNCH_ANIMATION_PULSE;41 launch_animation = LAUNCH_ANIMATION_PULSE;
42 tile_size = 54;42 tile_size = 54;
@@ -59,4 +59,4 @@
5959
6060
61}61}
62}
63\ No newline at end of file62\ No newline at end of file
63}