[gnome-shell] search: Don't expand search when clicking section headers

[Florian Müllner <fmuellner src gnome org>]

commit 7f5135016ed7476bc3457668d853bc114feea9d9
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Mar 2 00:15:17 2011 +0100

    search: Don't expand search when clicking section headers
    
    Currently section headers in the search view are reactive and run
    the corresponding provider's expandSearch() function when clicked,
    which should launch an external program displaying all search
    results for the section. Unfortunately it is only implemented for
    the "Settings" provider, and does not work properly (as it ignores
    the search and just launches System Settings).
    Also current mockups deemphasize the section header, making the
    feature pretty much indiscoverable (except by accident when
    interfering with swipe-scrolling).
    In conclusion, the feature does not make much sense in its current
    form, so remove it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=643632

 js/ui/appDisplay.js    |   10 ----------
 js/ui/docDisplay.js    |    4 ----
 js/ui/search.js        |   11 -----------
 js/ui/searchDisplay.js |   14 +++-----------
 4 files changed, 3 insertions(+), 36 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index cd5983b..364b637 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -294,10 +294,6 @@ AppSearchProvider.prototype = {
         let app = this._appSys.get_app(resultMeta['id']);
         let icon = new AppWellIcon(app);
         return icon.actor;
-    },
-
-    expandSearch: function(terms) {
-        log('TODO expand search');
     }
 };
 
@@ -318,12 +314,6 @@ PrefsSearchProvider.prototype = {
 
     getSubsearchResultSet: function(previousResults, terms) {
         return this._appSys.subsearch(true, previousResults, terms);
-    },
-
-    expandSearch: function(terms) {
-        let controlCenter = this._appSys.load_from_desktop_file('gnomecc.desktop');
-        controlCenter.launch();
-        Main.overview.hide();
     }
 };
 
diff --git a/js/ui/docDisplay.js b/js/ui/docDisplay.js
index 2e77f8c..85bbdf9 100644
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -43,9 +43,5 @@ DocSearchProvider.prototype = {
 
     getSubsearchResultSet: function(previousResults, terms) {
         return this._docManager.subsearch(previousResults, terms);
-    },
-
-    expandSearch: function(terms) {
-        log('TODO expand docs search');
     }
 };
diff --git a/js/ui/search.js b/js/ui/search.js
index ca35341..fce5866 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -209,17 +209,6 @@ SearchProvider.prototype = {
      */
     activateResult: function(id) {
         throw new Error('Not implemented');
-    },
-
-    /**
-     * expandSearch:
-     *
-     * Called when the user clicks on the header for this
-     * search section.  Should typically launch an external program
-     * displaying search results for that item type.
-     */
-    expandSearch: function(terms) {
-        throw new Error('Not implemented');
     }
 };
 Signals.addSignalMethods(SearchProvider.prototype);
diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index ae7bce6..552737e 100644
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -243,13 +243,9 @@ SearchResults.prototype = {
     createProviderMeta: function(provider) {
         let providerBox = new St.BoxLayout({ style_class: 'search-section',
                                              vertical: true });
-        let titleButton = new St.Button({ style_class: 'search-section-header',
-                                          reactive: true,
-                                          x_fill: true,
-                                          y_fill: true });
-        titleButton.connect('clicked', Lang.bind(this, function () { this._onHeaderClicked(provider); }));
-        providerBox.add(titleButton);
-        titleButton.set_child(new St.Label({ text: provider.title }));
+        let title = new St.Label({ style_class: 'search-section-header',
+                                   text: provider.title });
+        providerBox.add(title);
 
         let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
                                             x_fill: true,
@@ -324,10 +320,6 @@ SearchResults.prototype = {
         return true;
     },
 
-    _onHeaderClicked: function(provider) {
-        provider.expandSearch(this._searchSystem.getTerms());
-    },
-
     _modifyActorSelection: function(resultDisplay, up) {
         let success;
         let index = resultDisplay.getSelectionIndex();