summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorNick Dedekind <nicholas.dedekind@gmail.com>2012-12-18 12:27:52 +0000
committerNick Dedekind <nicholas.dedekind@gmail.com>2012-12-18 12:27:52 +0000
commitf3f9580c4636386b0564ec430c4c0ca667032ddd (patch)
tree201cfda38d93b613ef7b534453b0028c421c663e /unity-shared
parent4180c3872fe397f4bd816e8bb3dfecdca59d62b8 (diff)
Removed search bar spinner timeout
(bzr r2998.4.1)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/SearchBarSpinner.cpp9
-rw-r--r--unity-shared/SearchBarSpinner.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/unity-shared/SearchBarSpinner.cpp b/unity-shared/SearchBarSpinner.cpp
index 6e1dbaec2..40f5567e4 100644
--- a/unity-shared/SearchBarSpinner.cpp
+++ b/unity-shared/SearchBarSpinner.cpp
@@ -163,18 +163,9 @@ SearchBarSpinner::SetState(SpinnerState state)
return;
_state = state;
- _spinner_timeout.reset();
_2d_rotate.Rotate_z(0.0f);
_rotation = 0.0f;
- if (_state == STATE_SEARCHING)
- {
- _spinner_timeout.reset(new glib::TimeoutSeconds(5, [&] {
- _state = STATE_READY;
- return false;
- }));
- }
-
QueueDraw();
}
diff --git a/unity-shared/SearchBarSpinner.h b/unity-shared/SearchBarSpinner.h
index aa1adf554..69f029edf 100644
--- a/unity-shared/SearchBarSpinner.h
+++ b/unity-shared/SearchBarSpinner.h
@@ -67,7 +67,6 @@ private:
nux::BaseTexture* _close;
nux::BaseTexture* _spin;
- glib::Source::UniquePtr _spinner_timeout;
glib::Source::UniquePtr _frame_timeout;
nux::Matrix4 _2d_rotate;