From 78272e5592a02a946d48fa85bef5378280a84f0c Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 2 Mar 2013 02:27:56 +0100 Subject: [PATCH] RemoteSearch: don't sort the last explicitly sorted provider last It's a confusing semantic, and keeping it causes bugs in the control center panels. https://bugzilla.gnome.org/show_bug.cgi?id=694974 --- js/ui/remoteSearch.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js index cd6afdf5a..e7cd6fea1 100644 --- a/js/ui/remoteSearch.js +++ b/js/ui/remoteSearch.js @@ -127,8 +127,6 @@ function remoteProvidersLoaded(loadState) { // Special case gnome-control-center to be always active and always first sortOrder.unshift('gnome-control-center.desktop'); - let numSorted = sortOrder.length; - loadState.loadedProviders.sort( function(providerA, providerB) { let idxA, idxB; @@ -148,15 +146,6 @@ function remoteProvidersLoaded(loadState) { return GLib.utf8_collate(nameA, nameB); } - if (numSorted > 1) { - // if providerA is the last, it goes after everything - if ((idxA + 1) == numSorted) - return 1; - // if providerB is the last, it goes after everything - else if ((idxB + 1) == numSorted) - return -1; - } - // if providerA isn't found, it's sorted after providerB if (idxA == -1) return 1;