SOGoMailListViewColumnsOrder is no longer mandatory in sogo defaults

Monotone-Parent: c54fb1d46a2e8d4d85dfdd53f857dcdc179f996f
Monotone-Revision: a42c8a3551da9474cae3cd9afc489aac08bcaf88

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2008-10-02T15:16:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2008-10-02 15:16:50 +00:00
parent 0bcc5fbdec
commit ba1e60db17
2 changed files with 13 additions and 2 deletions
+7 -1
View File
@@ -678,9 +678,15 @@
ud = [[context activeUser] userSettings];
userDefinedOrder = [NSArray arrayWithArray: [ud arrayForKey: @"SOGoMailListViewColumnsOrder"]];
if ( [userDefinedOrder count] == 0 ) {
if ( [userDefinedOrder count] == 0 )
{
userDefinedOrder = [[NSUserDefaults standardUserDefaults] arrayForKey: @"SOGoMailListViewColumnsOrder"];
}
if ( [userDefinedOrder count] == 0 )
{
userDefinedOrder = [NSArray arrayWithObjects: @"Invisible", @"Attachment", @"Subject",
@"From", @"Unread", @"Date", @"Priority", nil];
}
columnsMetaData = [self columnsMetaData];
columnsDisplayOrder = [NSMutableArray array];
+6 -1
View File
@@ -86,8 +86,13 @@
sud = [NSUserDefaults standardUserDefaults];
defaultColumnsOrder = [NSArray arrayWithArray: [sud arrayForKey: @"SOGoMailListViewColumnsOrder"]];
if ( [defaultColumnsOrder count] == 0 )
{
defaultColumnsOrder = [NSArray arrayWithObjects: @"Invisible", @"Attachment", @"Subject",
@"From", @"Unread", @"Date", @"Priority", nil];
}
return [defaultColumnsOrder jsonRepresentation];
return [defaultColumnsOrder jsonRepresentation];
}
- (NSString *) quotaSupport