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

Merged

Browse Source
This commit is contained in:
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 2009-02-10 21:54:24 -08:00
commit a2cdfddf61
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,15 +431,25 @@ WeaveSvc.prototype = {
findCluster: function WeaveSvc_findCluster(onComplete, username) {
let fn = function WeaveSvc__findCluster() {
let self = yield;
let ret = false;
this._log.debug("Finding cluster for user " + username);
let res = new Resource(this.baseURL + "api/register/chknode/" + username);
yield res.get(self.cb);
if (res.lastChannel.responseStatus != 200) {
self.done(false);
return;
try {
yield res.get(self.cb);
} catch (e) { /* we check status below */ }
if (res.lastChannel.responseStatus == 404) {
this._log.debug("Using serverURL as data cluster (multi-cluster support disabled)");
this.clusterURL = Svc.Prefs.get("serverURL");
ret = true;
} else if (res.lastChannel.responseStatus == 200) {
this.clusterURL = 'https://' + res.data + '/';
ret = true;
}
this.clusterURL = 'https://' + res.data + '/';
self.done(true);
self.done(ret);
};
fn.async(this, onComplete);
},

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

@ -16,7 +16,7 @@ pref("extensions.weave.syncOnQuit.enabled", true);
pref("extensions.weave.engine.bookmarks", true);
pref("extensions.weave.engine.history", true);
pref("extensions.weave.engine.cookies", true );
pref("extensions.weave.engine.cookies", false);
pref("extensions.weave.engine.passwords", false);
pref("extensions.weave.engine.forms", false);
pref("extensions.weave.engine.tabs", true);