Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 535477 - Always sync tabs but inform Fennec users that recent tabs need syncing

Browse Source 
Remove special casing of tabs prefs and remove tabs.backup to simplify the UI logic. Also remove dynamically enabling/disabling based on number of clients. For Fennec, show a notification about recent tabs need syncing.
This commit is contained in:
Edward Lee 2009-12-16 19:15:18 -08:00
parent dcc74fa6ed
commit 645d705058
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/sync/locales/en-US/sync.properties
View File

@ -21,6 +21,7 @@ mobile.label = Mobile Bookmarks
remote.pending.label = Remote tabs are being synced…
remote.missing.label = Sync your other computers again to access their tabs
remote.opened.label = All remote tabs are already open
remote.notification.label = Recent desktop tabs will be available once they sync
error.login.title = Error While Signing In
error.login.description = Weave encountered an error while signing you in: %1$S. Please try again.

8
services/sync/modules/service.js
View File

@ -1187,18 +1187,10 @@ WeaveSvc.prototype = {
if (numClients == 1) {
this.syncInterval = SINGLE_USER_SYNC;
this.syncThreshold = SINGLE_USER_THRESHOLD;
// Disable tabs sync for single client, but store the original value
Svc.Prefs.set("engine.tabs.backup", tabEngine.enabled);
tabEngine.enabled = false;
}
else {
this.syncInterval = hasMobile ? MULTI_MOBILE_SYNC : MULTI_DESKTOP_SYNC;
this.syncThreshold = hasMobile ? MULTI_MOBILE_THRESHOLD : MULTI_DESKTOP_THRESHOLD;
// Restore the original tab enabled value
tabEngine.enabled = Svc.Prefs.get("engine.tabs.backup", true);
Svc.Prefs.reset("engine.tabs.backup");
}
},

1
services/sync/services-sync.js
View File

@ -14,7 +14,6 @@ pref("extensions.weave.engine.history", true);
pref("extensions.weave.engine.passwords", true);
pref("extensions.weave.engine.prefs", true);
pref("extensions.weave.engine.tabs", true);
pref("extensions.weave.engine.tabs.backup", true);
pref("extensions.weave.engine.tabs.filteredUrls", "^(about:blank|chrome://weave/.*)$");
pref("extensions.weave.log.appender.console", "Warn");