From 4965b1ca7b2b28e0f07007baf8e9943f5570291b Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 2 Nov 2013 20:09:14 -0400
Subject: [PATCH] search: Fix previous commit

It was pushed by accident before it was tested...
---
 js/ui/appDisplay.js   | 4 ++--
 js/ui/remoteSearch.js | 2 +-
 js/ui/search.js       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 0e9243238..aad503252 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -894,8 +894,8 @@ const AppSearchProvider = new Lang.Class({
         callback(this._appSys.initial_search(terms));
     },
 
-    getSubsearchResultSet: function(terms, callback, cancellable) {
-        callbacl(this._appSys.subsearch(previousResults, terms));
+    getSubsearchResultSet: function(previousResults, terms, callback, cancellable) {
+        callback(this._appSys.subsearch(previousResults, terms));
     },
 
     activateResult: function(result) {
diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index e21416e06..cd95069ea 100644
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -249,7 +249,7 @@ const RemoteSearchProvider = new Lang.Class({
                                              cancellable);
     },
 
-    getSubsearchResultSet: function(previousResults, newTerms, cancellable) {
+    getSubsearchResultSet: function(previousResults, newTerms, callback, cancellable) {
         this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
                                                Lang.bind(this, this._getResultsFinished, callback),
                                                cancellable);
diff --git a/js/ui/search.js b/js/ui/search.js
index 1b2953a98..4bde7fcba 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -112,8 +112,8 @@ const SearchSystem = new Lang.Class({
 
         if (isSubSearch) {
             this._providers.forEach(Lang.bind(this, function(provider) {
-                let previousResults = previousResults[provider.id];
-                provider.getSubsearchResultSet(previousResults, terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
+                let previousProviderResults = previousResults[provider.id];
+                provider.getSubsearchResultSet(previousProviderResults, terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
             }));
         } else {
             this._providers.forEach(Lang.bind(this, function(provider) {