1 files changed, 10 insertions, 10 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index 72d4006..646ce21 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -45,5 +45,5 @@ Clipperz.PM.DataModel.User = function (args) {
 
         this._serverData = null;
-        this._serverLockValue = null;
+        //this._serverLockValue = null;
         this._transientState = null;
 
@@ -94,5 +94,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 
         //-------------------------------------------------------------------------
-
+/*
         'serverLockValue': function () {
                 return this._serverLockValue;
@@ -102,5 +102,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 this._serverLockValue = aValue;
         },
-
+*/
         //-------------------------------------------------------------------------
 
@@ -221,6 +221,6 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addMethod(this.connection(), 'register');
-                deferredResult.addCallback(MochiKit.Base.itemgetter('lock'));
-                deferredResult.addMethod(this, 'setServerLockValue');
+        //      deferredResult.addCallback(MochiKit.Base.itemgetter('lock'));
+        //      deferredResult.addMethod(this, 'setServerLockValue');
                         deferredResult.addCallbackPass(MochiKit.Signal.signal,Clipperz.Signal.NotificationCenter, 'userSuccessfullyRegistered');
 
@@ -248,5 +248,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 ], []));
                 deferredResult.addErrback(MochiKit.Base.method(this, 'getPassphrase'));
-                deferredResult.addMethod(this.connection(), 'login');
+                deferredResult.addMethod(this.connection(), 'login', false);
                         deferredResult.addCallbackPass(MochiKit.Signal.signal,Clipperz.Signal.NotificationCenter, 'userSuccessfullyLoggedIn');
                 deferredResult.addErrback (MochiKit.Base.method(this, 'handleConnectionFallback'));
@@ -330,5 +330,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 
 //console.log(">>> ***************** user.unpackServerData", someServerData);
-                this.setServerLockValue(someServerData['lock']);
+        //      this.setServerLockValue(someServerData['lock']);
 
                 headerVersion = this.headerFormatVersion(someServerData['header']);
@@ -663,6 +663,6 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 
                         MochiKit.Base.method(this, 'transientState'),
-                        MochiKit.Base.itemgetter('lock'),
-                        MochiKit.Base.method(this, 'setServerLockValue'),
+        //              MochiKit.Base.itemgetter('lock'),
+        //              MochiKit.Base.method(this, 'setServerLockValue'),
                         MochiKit.Base.method(this, 'resetTransientState', true)
                 ], {trace:false});
@@ -741,5 +741,5 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 }, this), result);
                 deferredResult.addCallback(Clipperz.Async.setItem, result, 'version', Clipperz.PM.Crypto.encryptingFunctions.currentVersion);
-                deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
+        //      deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
                 deferredResult.callback();