Unity

Merge lp:~vanvugt/unity/fix-901610-trunk into lp:unity

  1. fix-901610-trunk
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alex Launi
Approved revision: no longer in the source branch.
Merged at revision: 1790
Proposed branch: lp:~vanvugt/unity/fix-901610-trunk
Merge into: lp:unity
Diff against target: 12 lines (+2/-1)
1 file modified
plugins/unityshell/src/DashSearchBarSpinner.cpp (+2/-1)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-901610-trunk
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+84918@code.launchpad.net

Description of the change

Fix uninitialized variable causing the dash search spinner to sometimes not spin (LP: #901610) (LP: #903090)

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/65/console reported an error when processing this lp:~vanvugt/unity/fix-901610-trunk branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/DashSearchBarSpinner.cpp'
2--- plugins/unityshell/src/DashSearchBarSpinner.cpp 2011-10-25 16:32:49 +0000
3+++ plugins/unityshell/src/DashSearchBarSpinner.cpp 2011-12-08 10:46:25 +0000
4@@ -34,7 +34,8 @@
5 : nux::View(NUX_TRACKER_LOCATION),
6 _state(STATE_READY),
7 _rotation(0.0f),
8- _spinner_timeout(0)
9+ _spinner_timeout(0),
10+ _frame_timeout(0)
11 {
12 dash::Style& style = dash::Style::Instance();
13