wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 924900 - Disable sync temporarily until pref service handles shared prefs. r=jimm

Browse Source
This commit is contained in:
Brian R. Bondy 2013-11-20 13:46:54 -05:00
parent 147aa73c8c
commit 3b682f74ff
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/metro/base/content/browser-ui.js
View File

@ -1303,11 +1303,15 @@ var SettingsCharm = {
label: Strings.browser.GetStringFromName("optionsCharm"), label: Strings.browser.GetStringFromName("optionsCharm"),
onselected: function() FlyoutPanelsUI.show('PrefsFlyoutPanel') onselected: function() FlyoutPanelsUI.show('PrefsFlyoutPanel')
}); });
/*
* Temporarily disabled until we can have sync prefs together with the
* Desktop browser's sync prefs.
// Sync // Sync
this.addEntry({ this.addEntry({
label: Strings.brand.GetStringFromName("syncBrandShortName"), label: Strings.brand.GetStringFromName("syncBrandShortName"),
onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel') onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel')
}); });
*/
// About // About
this.addEntry({ this.addEntry({
label: Strings.browser.GetStringFromName("aboutCharm1"), label: Strings.browser.GetStringFromName("aboutCharm1"),

6
browser/metro/base/content/browser.xul
View File

@ -142,10 +142,14 @@
<!-- development/testing --> <!-- development/testing -->
<key id="key_console" key="&jsConsole.key;" modifiers="accel,shift" oncommand="PanelUI.show('console-container')"/> <key id="key_console" key="&jsConsole.key;" modifiers="accel,shift" oncommand="PanelUI.show('console-container')"/>
<key id="key_options" key="&optionsFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" /> <key id="key_options" key="&optionsFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
<key id="key_options" key="&aboutFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
<!--
Temporarily disabled until we can have sync prefs together with the
Desktop browser's sync prefs.
#ifdef MOZ_SERVICES_SYNC #ifdef MOZ_SERVICES_SYNC
<key id="key_options" key="&syncFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" /> <key id="key_options" key="&syncFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
#endif #endif
<key id="key_options" key="&aboutFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" /> -->
<!-- manage tabs --> <!-- manage tabs -->
<key id="key_newTab" key="&newTab.key;" modifiers="accel" command="cmd_newTab"/> <key id="key_newTab" key="&newTab.key;" modifiers="accel" command="cmd_newTab"/>