From 23dc7dd4749ecaf9bc345ce0516801dd0f9a93f3 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 11 Dec 2009 14:57:57 +0000
Subject: [PATCH] Monotone-Parent: 0fae105daa23d0bfd278a2c1253b578984b8876e
 Monotone-Revision: 2977eee44dc8cb28a84d3198502b07eacfaf2472

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-11T14:57:57
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         | 6 ++++++
 UI/PreferencesUI/UIxPreferences.m | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8ed0ffc10..5feac6cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (-setUserShortDateFormat:):
+	fixed handling of the value "default", which actually should
+	unset the value in the user defaults.
+
 2009-12-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-toManyRelationShipKeys)
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 1f80475ae..c70b677de 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -207,7 +207,10 @@
 
 - (void) setUserShortDateFormat: (NSString *) newFormat
 {
-  [userDefaults setShortDateFormat: newFormat];
+  if ([newFormat isEqualToString: @"default"])
+    [userDefaults unsetShortDateFormat];
+  else
+    [userDefaults setShortDateFormat: newFormat];
 }
 
 - (NSArray *) longDateFormatsList