[geary/wip/778728-split-composer: 14/19] Fix search loading spinner never disappearing when autoselect disabled.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/778728-split-composer: 14/19] Fix search loading spinner never disappearing when autoselect disabled.
- Date: Thu, 12 Oct 2017 02:08:56 +0000 (UTC)
commit 456d3e94c6aed1d1294a8f597203483ce1ac5033
Author: Michael James Gratton <mike vee net>
Date: Tue Oct 10 17:09:13 2017 -0700
Fix search loading spinner never disappearing when autoselect disabled.
src/client/application/geary-controller.vala | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 5ad6247..b263530 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1487,15 +1487,24 @@ public class GearyController : Geary.BaseObject {
private void on_conversation_count_changed() {
if (this.current_conversations != null) {
+ ConversationViewer viewer = this.main_window.conversation_viewer;
int count = this.current_conversations.get_conversation_count();
if (count == 0) {
// Let the user know if there's no available conversations
if (this.current_folder is Geary.SearchFolder) {
- this.main_window.conversation_viewer.show_empty_search();
+ viewer.show_empty_search();
} else {
- this.main_window.conversation_viewer.show_empty_folder();
+ viewer.show_empty_folder();
}
enable_message_buttons(false);
+ } else {
+ // When not doing autoselect, we never get
+ // conversations_selected firing from the convo list,
+ // so we need to stop the loading spinner here
+ if (!this.application.config.autoselect) {
+ viewer.show_none_selected();
+ enable_message_buttons(false);
+ }
}
conversation_count_changed(count);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]