Monotone-Parent: 976fbbced4c8072301ab3b7f3db4502aa6db30a2

Monotone-Revision: ca8b6f66b3229e1d266d74bf935113148af5f09c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-01T17:56:51
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailSortableTableHeader.m

@@ -105,22 +105,26 @@
 
 /* derived accessors */
 
-- (BOOL)isSelected {
+- (BOOL) isSelected
+{
   NSString *so;
-  
-  if ((so = [self singleQueryValueForKey:@"sort"]) == nil)
-    return self->isDefault;
-  
-  return [so isEqualToString:self->sortKey];
+ 
+  so = [self singleQueryValueForKey:@"sort"];
+
+  return ((so)
+          ? [so isEqualToString:self->sortKey]
+          : isDefault);
 }
 
-- (BOOL)isSortedDescending {
+- (BOOL)isSortedDescending
+{
   NSString *desc;
 
-  if ((desc = [self singleQueryValueForKey:@"desc"]) == nil)
-    return NO;
-  
-  return [desc boolValue];
+  desc = [[[self context] request] formValueForKey:@"desc"];
+
+  return ((desc)
+          ? [desc boolValue]
+          : YES);
 }
 
 @end /* UIxMailSortableTableHeader */