amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-02 18:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3c3f676520d5f154730079c576d8ffde515851cd

Browse Source 
Monotone-Revision: 83e7d2455de99bbdf6ca18f2e16478d506a07412

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-30T15:42:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-30 15:42:16 +00:00
parent c78ad98742
commit 0b74efd7f2
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -2
View File
@@ -2,8 +2,9 @@
* SoObjects/SOGo/SOGoDefaultsSource.m
(-migrateOldDefaultsWithDictionary:): when migrating between two
existing keys, the migration is not interrupted if both values are
the same.
existing keys, the new value is automatically overwritten with the
old one, since it causes a problem with the values inherited from
SOGoDefaults.plist.
2009-11-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
SoObjects/SOGo/SOGoDefaultsSource.m
+5 -12
View File
@@ -213,18 +213,11 @@ NSString *SOGoDefaultsSourceUnmutableSource = @"SOGoDefaultsSourceUnmutableSourc
{
newName = [migratedKeys objectForKey: oldName];
existingValue = [source objectForKey: newName];
if (existingValue && ![existingValue isEqual: currentValue])
[self errorWithFormat: @"both old and new defaults key"
@" ('%@' and '%@') exist with a different value."
@" Migration skipped.", oldName, newName];
else
{
requireSync = YES;
[source setObject: currentValue forKey: newName];
[source removeObjectForKey: oldName];
[self warnWithFormat: @"defaults key '%@' was renamed to '%@'",
oldName, newName];
}
requireSync = YES;
[source setObject: currentValue forKey: newName];
[source removeObjectForKey: oldName];
[self warnWithFormat: @"defaults key '%@' was renamed to '%@'",
oldName, newName];
}
}