Implemented Marco's remarks on PIN and Preferences

frontend/delta/js/Clipperz/PM/DataModel/User.Header.Preferences.js

@@ -40,19 +40,27 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.Preferences, Clipperz.PM.
 	},
 
 	//-------------------------------------------------------------------------
-	
-	'mergeDefaultPreferences': function(somePreferences) {
+
+	'mergePreferences': function(somePreferences, someOtherPreferences) {
 		var result;
 
 		result = new Clipperz.KeyValueObjectStore();
 
 		result.setValues(MochiKit.Base.updatetree(
-			Clipperz.Base.deepClone(Clipperz.PM.DataModel.User.Header.Preferences.defaultPreferences),
+			Clipperz.Base.deepClone(someOtherPreferences),
 			somePreferences
 		));
 
 		return result;
 	},
+	
+	'mergeDefaultPreferences': function(somePreferences) {
+		return this.mergePreferences(somePreferences, Clipperz.PM.DataModel.User.Header.Preferences.defaultPreferences);
+	},
+
+	'mergeUserPreferences': function(somePreferences) {
+		return this.mergePreferences(somePreferences, this._objectDataStore.values());
+	},
 
 	'getPreferences': function() {
 		return Clipperz.Async.callbacks("User.Header.Preferences.getPreferences", [
@@ -68,6 +76,14 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.Preferences, Clipperz.PM.
 		], {trace:false});
 	},
 
+	'setPreferences': function(anObject) {
+		return Clipperz.Async.callbacks("User.Header.Preferences.setPreferences", [
+			MochiKit.Base.method(this, 'mergeUserPreferences', anObject),
+			MochiKit.Base.methodcaller('values'),
+			MochiKit.Base.method(this, 'setValues')
+		], {trace:false});
+	},
+
 	//=========================================================================
 	__syntaxFix__: "syntax fix"
 });

frontend/delta/js/Clipperz/PM/DataModel/User.js

@@ -929,10 +929,10 @@ console.log("Warning: User.recordWithLabel('" + aLabel + "') is returning more t
 		], {trace:false});
 	},
 
-	'setPreference': function(aKey, aValue) {
-		return Clipperz.Async.callbacks("User.setPreference", [
+	setPreferences: function(anObject) {
+		return Clipperz.Async.callbacks("User.setPreferences", [
 			MochiKit.Base.method(this, 'getHeaderIndex', 'preferences'),
-			MochiKit.Base.methodcaller('setValue', aKey, aValue),
+			MochiKit.Base.methodcaller('setPreferences', anObject),
 			MochiKit.Base.method(this, 'saveChanges')
 		], {trace:false});
 	},