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-17 16:29:02 -08:00
commit 31a66bed25
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/sync/modules/engines.js
View File

@ -199,14 +199,15 @@ SyncEngine.prototype = {
},
get lastSync() {
try {
return Utils.prefs.getCharPref(this.name + ".lastSync");
} catch (e) {
return 0;
}
return Svc.Prefs.get(this.name + ".lastSync", 0);
},
set lastSync(value) {
Utils.prefs.setCharPref(this.name + ".lastSync", value);
Svc.Prefs.set(this.name + ".lastSync", value);
},
resetLastSync: function SyncEngine_resetLastSync() {
this._log.debug("Resetting " + this.name + " last sync time");
Svc.Prefs.reset(this.name + ".lastSync");
Svc.Prefs.set(this.name + ".lastSync", 0);
},
// Create a new record by querying the store, and add the engine metadata

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

@ -603,9 +603,6 @@ WeaveSvc.prototype = {
}
}
// FIXME: too easy to generate a keypair. we should be absolutely certain
// that the keys are not there (404) and that it's not some other
// transient network problem instead
let needKeys = true;
let pubkey = yield PubKeys.getDefaultKey(self.cb);
if (pubkey) {
@ -616,7 +613,6 @@ WeaveSvc.prototype = {
ret = true;
}
}
if (needKeys) {
if (PubKeys.lastResource.lastChannel.responseStatus != 404 &&
PrivKeys.lastResource.lastChannel.responseStatus != 404) {
@ -791,18 +787,23 @@ WeaveSvc.prototype = {
}
},
// XXX deletes all known collections; we should have a way to delete
// everything on the server by querying it to get all collections
_wipeServer: function WeaveSvc__wipeServer() {
let self = yield;
// tmp, delete all known collections
for each (let coll in ["keys", "crypto", "clients",
"bookmarks", "history", "tabs"]) {
let res = new Resource(this.clusterURL + this.username + "/" + coll + "/");
let engines = Engines.getAll();
engines.push(Clients, {name: "keys"}, {name: "crypto"});
for each (let engine in engines) {
let url = this.clusterURL + this.username + "/" + engine.name + "/";
let res = new Resource(url);
try {
yield res.delete(self.cb);
} catch (e) {
this._log.debug("Exception on delete: " + Utils.exceptionStr(e));
}
if (engine.resetLastSync)
engine.resetLastSync();
}
},
wipeServer: function WeaveSvc_wipeServer(onComplete) {