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
@@ -46,3 +46,3 @@ Clipperz.PM.DataModel.User = function (args) {
         this._serverData = null;
-        this._serverLockValue = null;
+        //this._serverLockValue = null;
         this._transientState = null;
@@ -95,3 +95,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
         //-------------------------------------------------------------------------
-
+/*
         'serverLockValue': function () {
@@ -103,3 +103,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
         },
-
+*/
         //-------------------------------------------------------------------------
@@ -222,4 +222,4 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 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');
@@ -249,3 +249,3 @@ 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');
@@ -331,3 +331,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 //console.log(">>> ***************** user.unpackServerData", someServerData);
-                this.setServerLockValue(someServerData['lock']);
+        //      this.setServerLockValue(someServerData['lock']);
 
@@ -664,4 +664,4 @@ 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)
@@ -742,3 +742,3 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 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();