Merge with head

This commit is contained in:
Anant Narayanan 2008-12-19 00:42:49 +01:00
commit f436cdf5ca

View File

@ -51,9 +51,9 @@ WeaveService.prototype = {
case "app-startup": case "app-startup":
let os = Components.classes["@mozilla.org/observer-service;1"]. let os = Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService); getService(Components.interfaces.nsIObserverService);
os.addObserver(this, "profile-after-change", true); os.addObserver(this, "sessionstore-windows-restored", true);
break; break;
case "profile-after-change": case "sessionstore-windows-restored":
Components.utils.import("resource://weave/service.js"); Components.utils.import("resource://weave/service.js");
Weave.Service.onStartup(); Weave.Service.onStartup();
break; break;