From 2a8342da17c85c7ee6c08513adf054de7afe7b93 Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Mon, 26 Apr 2010 11:37:12 -0700
Subject: [PATCH] Bug 561638 - Weave Error in Trunk Nightly (Status Bar Icon
 Missing) [r=mconnor] Remove the extra name from get/set declarations now that
 Spidermonkey doesn't want them.

---
 services/sync/modules/identity.js | 8 +++-----
 services/sync/modules/service.js  | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/services/sync/modules/identity.js b/services/sync/modules/identity.js
index 82e690046e9..2a3ef3b9aac 100644
--- a/services/sync/modules/identity.js
+++ b/services/sync/modules/identity.js
@@ -81,7 +81,7 @@ function Identity(realm, username, password) {
   this._password = password;
 }
 Identity.prototype = {
-  get password password() {
+  get password() {
     // Look up the password then cache it
     if (this._password == null)
       for each (let login in this._logins)
@@ -90,9 +90,7 @@ Identity.prototype = {
     return this._password;
   },
 
-  set password password(value) {
-    this._password = value;
-  },
+  set password(value) this._password = value,
 
   persist: function persist() {
     // Clean up any existing passwords unless it's what we're persisting
@@ -120,5 +118,5 @@ Identity.prototype = {
     Svc.Login.addLogin(newLogin);
   },
 
-  get _logins _logins() Svc.Login.findLogins({}, PWDMGR_HOST, null, this.realm)
+  get _logins() Svc.Login.findLogins({}, PWDMGR_HOST, null, this.realm)
 };
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 58a72e6f2a0..b39135a44cc 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -126,11 +126,11 @@ WeaveSvc.prototype = {
     this._updateCachedURLs();
   },
 
-  get password password() ID.get("WeaveID").password,
-  set password password(value) ID.get("WeaveID").password = value,
+  get password() ID.get("WeaveID").password,
+  set password(value) ID.get("WeaveID").password = value,
 
-  get passphrase passphrase() ID.get("WeaveCryptoID").password,
-  set passphrase passphrase(value) ID.get("WeaveCryptoID").password = value,
+  get passphrase() ID.get("WeaveCryptoID").password,
+  set passphrase(value) ID.get("WeaveCryptoID").password = value,
 
   get serverURL() Svc.Prefs.get("serverURL"),
   set serverURL(value) {