[geary/wip/765516-gtk-widget-conversation-viewer: 92/207] Chase recent master ConversationViewer search changes.

[Michael Gratton <mjog src gnome org>]

commit 5283b0354d6d72a1686e62a92d04599913115df4
Author: Michael James Gratton <mike vee net>
Date:   Sun Jun 19 23:31:29 2016 +1000

    Chase recent master ConversationViewer search changes.

 .../conversation-viewer/conversation-viewer.vala   |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-viewer.vala 
b/src/client/conversation-viewer/conversation-viewer.vala
index e8c66ef..e5d6a45 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -492,12 +492,7 @@ public class ConversationViewer : Gtk.Stack {
             debug("Unable to select conversation: %s", err.message);
         }
     }
-    
-    private void on_search_text_changed(Geary.SearchQuery? query) {
-        if (query != null)
-            highlight_search_terms.begin();
-    }
-    
+
     private async void highlight_search_terms() {
         Geary.SearchQuery? query = (this.search_folder != null)
             ? search_folder.search_query
@@ -722,15 +717,14 @@ public class ConversationViewer : Gtk.Stack {
         //web_view.set_highlight_text_matches(false);
         //web_view.allow_collapsing(true);
         //web_view.unmark_text_matches();
-        
+
         if (search_folder != null) {
-            search_folder.search_query_changed.disconnect(on_search_text_changed);
             search_folder = null;
         }
-        
+
         //if (conversation_find_bar.visible)
         //    fsm.do_post_transition(() => { conversation_find_bar.hide(); }, user, object);
-        
+
         return SearchState.NONE;
     }
 
@@ -789,13 +783,11 @@ public class ConversationViewer : Gtk.Stack {
             return SearchState.NONE;
         } 
     }
-    
+
     // Search folder entered.
     private uint on_enter_search_folder(uint state, uint event, void *user, Object? object) {
         search_folder = current_folder as Geary.SearchFolder;
         assert(search_folder != null);
-        search_folder.search_query_changed.connect(on_search_text_changed);
-        
         return SearchState.SEARCH_FOLDER;
     }