[geary/geary-0.12] Fix search loading spinner never disappearing when autoselect disabled.



commit b7bf7df99a726b06bcc36315fd18f108225b0859
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 a2f36e4..48ed734 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1485,15 +1485,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]