amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-24 23:52:43 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3ec2e0f99bbf37c3d347f65454edef902b376d18

Browse Source 
Monotone-Revision: 3c3f676520d5f154730079c576d8ffde515851cd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-30T14:48:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-30 14:48:50 +00:00
parent f9c8deb0b5
commit c78ad98742
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2009-11-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoDefaultsSource.m
(-migrateOldDefaultsWithDictionary:): when migrating between two
existing keys, the migration is not interrupted if both values are
the same.
2009-11-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserManager.m

5
SoObjects/SOGo/SOGoDefaultsSource.m
View File

@@ -213,9 +213,10 @@ NSString *SOGoDefaultsSourceUnmutableSource = @"SOGoDefaultsSourceUnmutableSourc
{
newName = [migratedKeys objectForKey: oldName];
existingValue = [source objectForKey: newName];
if (existingValue)
if (existingValue && ![existingValue isEqual: currentValue])
[self errorWithFormat: @"both old and new defaults key"
@" '%@' '%@' exist. Migration skipped.", oldName, newName];
@" ('%@' and '%@') exist with a different value."
@" Migration skipped.", oldName, newName];
else
{
requireSync = YES;