[gnome-shell] search: Rename pushResults to setResults
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] search: Rename pushResults to setResults
- Date: Wed, 29 May 2013 15:33:08 +0000 (UTC)
commit 37e2b60cd3e5a97eb43134f2aa9a0ef78126d1d1
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Feb 8 22:03:28 2013 -0500
search: Rename pushResults to setResults
pushResults, and the original async search API, were originally intended
so search results that weren't immediate could be added as they come in.
Since then, we've decided that the design of search results is that they
should finish at once with all results. Thus, the code was modified so
that pushResults always overwrote the current result set. As such, it makes
sense to rename the method so that the name matches the behavior.
https://bugzilla.gnome.org/show_bug.cgi?id=693836
js/ui/appDisplay.js | 4 ++--
js/ui/remoteSearch.js | 6 +++---
js/ui/search.js | 2 +-
js/ui/wanda.js | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 7f92d12..8cba94e 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -509,11 +509,11 @@ const AppSearchProvider = new Lang.Class({
},
getInitialResultSet: function(terms) {
- this.searchSystem.pushResults(this, this._appSys.initial_search(terms));
+ this.searchSystem.setResults(this, this._appSys.initial_search(terms));
},
getSubsearchResultSet: function(previousResults, terms) {
- this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
+ this.searchSystem.setResults(this, this._appSys.subsearch(previousResults, terms));
},
activateResult: function(app) {
diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index 3d0c759..3aa74e4 100644
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -205,7 +205,7 @@ const RemoteSearchProvider = new Lang.Class({
_getResultsFinished: function(results, error) {
if (error)
return;
- this.searchSystem.pushResults(this, results[0]);
+ this.searchSystem.setResults(this, results[0]);
},
getInitialResultSet: function(terms) {
@@ -217,7 +217,7 @@ const RemoteSearchProvider = new Lang.Class({
this._cancellable);
} catch(e) {
log('Error calling GetInitialResultSet for provider %s: %s'.format(this.id, e.toString()));
- this.searchSystem.pushResults(this, []);
+ this.searchSystem.setResults(this, []);
}
},
@@ -230,7 +230,7 @@ const RemoteSearchProvider = new Lang.Class({
this._cancellable);
} catch(e) {
log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.id, e.toString()));
- this.searchSystem.pushResults(this, []);
+ this.searchSystem.setResults(this, []);
}
},
diff --git a/js/ui/search.js b/js/ui/search.js
index 3dd59d7..03348b2 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -51,7 +51,7 @@ const SearchSystem = new Lang.Class({
this._previousResults = [];
},
- pushResults: function(provider, results) {
+ setResults: function(provider, results) {
let i = this._providers.indexOf(provider);
if (i == -1)
return;
diff --git a/js/ui/wanda.js b/js/ui/wanda.js
index 3d5d568..713f4cd 100644
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -134,9 +134,9 @@ const WandaSearchProvider = new Lang.Class({
getInitialResultSet: function(terms) {
if (terms.join(' ') == MAGIC_FISH_KEY) {
- this.searchSystem.pushResults(this, [ FISH_NAME ]);
+ this.searchSystem.setResults(this, [ FISH_NAME ]);
} else {
- this.searchSystem.pushResults(this, []);
+ this.searchSystem.setResults(this, []);
}
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]