merge upstream changes

services/sync/Weave.js

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

services/sync/modules/clientData.js

@@ -109,12 +109,24 @@ ClientDataSvc.prototype = {
   _refresh: function ClientData__refresh() {
     let self = yield;
 
-    let ret = yield DAV.MKCOL("meta", self.cb);
+   // No more such thing as DAV.  I think this is making a directory.
+    // Will the directory now be handled automatically? (YES)
+   /* let ret = yield DAV.MKCOL("meta", self.cb);
     if(!ret)
-      throw "Could not create meta information directory";
+      throw "Could not create meta information directory";*/
 
+    // This fails horribly because this._remote._uri.spec is null. What's
+    // that mean?
+    // Spec is supposed to be just a string?
+
+    // Probably problem has to do with Resource getting intialized by
+    // relative, not absolute, path?
+    // Use WBORecord (Weave Basic Object) from wbo.js?
+    this._log.debug("The URI is " + this._remote._uri);
+    this._log.debug("The URI.spec is " + this._remote._uri.spec);
     try { yield this._remote.get(self.cb); }
     catch (e if e.status == 404) {
+      this._log.debug("404ed.  Using empty for remote data.");
       this._remote.data = {};
     }
 

services/sync/modules/service.js

@@ -428,7 +428,7 @@ WeaveSvc.prototype = {
 
     this.username = username;
     ID.get('WeaveID').setTempPassword(password);
-    
+
     let id = new Identity('Passphrase Verification', username);
     id.setTempPassword(passphrase);
 
@@ -541,7 +541,7 @@ WeaveSvc.prototype = {
     if (!(yield this._remoteSetup.async(this, self.cb))) {
       throw "aborting sync, remote setup failed";
     }
-
+    // TODO This right here.  Make sure it works.
     //this._log.debug("Refreshing client list");
     //yield ClientData.refresh(self.cb);