Bug 1372528 - Change search settings redirects to General section of about:preferences r?jaws
MozReview-Commit-ID: J5biFoOjsXX
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1595,17 +1595,17 @@ file, You can obtain one at http://mozil
role="link"
#ifdef XP_WIN
value="&urlbar.searchSuggestionsNotification.changeSettingsWin;"
accesskey="&urlbar.searchSuggestionsNotification.changeSettingsWin.accesskey;"
#else
value="&urlbar.searchSuggestionsNotification.changeSettingsUnix;"
accesskey="&urlbar.searchSuggestionsNotification.changeSettingsUnix.accesskey;"
#endif
- onclick="openPreferences('general-search');"
+ onclick="Preferences.get('browser.preferences.useOldOrganization') ? openPreferences('paneSearch') : openPreferences('general-search');"
control="search-suggestions-change-settings"/>
</xul:hbox>
</xul:deck>
<xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox"
flex="1"/>
<xul:hbox anonid="footer">
<children/>
<xul:vbox anonid="one-off-search-buttons"
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1467,17 +1467,23 @@
// Make sure the engine list is refetched next time it's needed.
this._engines = null;
]]></body>
</method>
<method name="showSettings">
<body><![CDATA[
BrowserUITelemetry.countSearchSettingsEvent(this.telemetryOrigin);
- openPreferences("general-search", {origin: "contentSearch"});
+
+ if (Preferences.get("browser.preferences.useOldOrganization")) {
+ openPreferences("paneSearch", {origin: "contentSearch"});
+ } else {
+ openPreferences("general-search", {origin: "contentSearch"});
+ }
+
// If the preference tab was already selected, the panel doesn't
// close itself automatically.
this.popup.hidePopup();
]]></body>
</method>
<!-- Updates the parts of the UI that show the query string. -->
<method name="_updateAfterQueryChanged">