Merge lp:~davidc3/singlet/fix-filters-typeerror into lp:singlet

[David Callé]

Currently, clicking on a filter option generates a TypeError.
This branch fixes it by using "queue_search_changed" (a Unity method to cancel the current search and start a new one with the same search string) when the filters-changed signal is received.

[Michael Hall (mhall119)]

Good catch, thanks for the fix.

review: Approve

=== modified file 'src/singlet/lens/base.py'
--- src/singlet/lens/base.py	2012-01-30 02:15:36 +0000
+++ src/singlet/lens/base.py	2012-03-07 16:00:30 +0000
@@ -155,7 +155,7 @@
         # Populate scopes
         self._scope = Unity.Scope.new ("%s/main" % self._meta.bus_path)
         self._scope.connect ("search-changed", self.on_search_changed)
-        self._scope.connect ("filters-changed", self.on_search_changed);
+        self._scope.connect ("filters-changed", self.on_filtering_changed);
         if self._meta.search_on_blank:
 
             self._scope.connect ("active", self.on_search_changed);
@@ -183,6 +183,9 @@
                     self.search(search_string, results)
         search.finished()
 
+    def on_filtering_changed(self, *_):
+        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+        
     def hide_dash_response(self, uri=''):
         return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri=uri)
         
 
=== modified file 'src/singlet/scope/base.py'
--- src/singlet/scope/base.py	2012-01-30 02:15:36 +0000
+++ src/singlet/scope/base.py	2012-03-07 16:00:30 +0000
@@ -95,7 +95,7 @@
         # Populate scopes
         self._scope = Unity.Scope.new ("%s" % self._meta.bus_path)
         self._scope.connect ("search-changed", self.on_search_changed)
-        self._scope.connect ("filters-changed", self.on_search_changed);
+        self._scope.connect ("filters-changed", self.on_filtering_changed);
         #if self._meta.search_on_blank:
             #self._scope.connect ("active", self.on_search_changed);
 
@@ -117,6 +117,9 @@
                     self.search(search_string, results, cancellable)
         search.finished()
 
+    def on_filtering_changed(self, *_):
+        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+        
     def hide_dash_response(self, uri=''):
         return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri=uri)