From ba1e60db17dbfbde6410afd69059e0a20c776216 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Thu, 2 Oct 2008 15:16:50 +0000
Subject: [PATCH] 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
---
 UI/MailerUI/UIxMailListView.m  | 8 +++++++-
 UI/MailerUI/UIxMailMainFrame.m | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 8d3de1ad5..8a77b0b38 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -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];
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 6222ca1c7..84fbdf1f1 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -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