merge of '00ffb0295fd6e6526c1e1132bcd23e8726c80997'

and '5cb63d3b6d43af52102d0fcf33a7587994776330'

Monotone-Parent: 00ffb0295fd6e6526c1e1132bcd23e8726c80997
Monotone-Parent: 5cb63d3b6d43af52102d0fcf33a7587994776330
Monotone-Revision: bcd29d180f0f481f03088f9e1fcb3066dcfdbcc9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-26T18:24:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-26 18:24:10 +00:00
2 changed files with 8 additions and 0 deletions

View File

@@ -6,6 +6,9 @@
when forwarding a mail with attachments and no
Content-Disposition header (or filename) was found. This
avoid losing attachments when forwarding mails.
* UI/PreferencesUI/UIxPreferences.m
We retain/release properly the vacationOptions and
forwardOptions ivars.
2009-11-24 Francis Lachapelle <flachapelle@inverse.ca>

View File

@@ -109,7 +109,9 @@ static BOOL forwardEnabled = NO;
vacationOptions = [NSMutableDictionary dictionary];
[userDefaults setObject: vacationOptions forKey: @"Vacation"];
}
[vacationOptions retain];
}
if (forwardEnabled)
{
forwardOptions = [userDefaults objectForKey: @"Forward"];
@@ -118,6 +120,7 @@ static BOOL forwardEnabled = NO;
forwardOptions = [NSMutableDictionary dictionary];
[userDefaults setObject: forwardOptions forKey: @"Forward"];
}
[forwardOptions retain];
}
}
@@ -130,6 +133,8 @@ static BOOL forwardEnabled = NO;
[item release];
[user release];
[userDefaults release];
[vacationOptions release];
[forwardOptions release];
[hours release];
[daysOfWeek release];
[locale release];