From 0e9c2deeabde43f42a5d5b87a80664816b6c84e8 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 22 Oct 2004 16:16:44 +0000
Subject: [PATCH] bugfixes

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@420 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Mailer/ChangeLog           |  2 ++
 SOGo/UI/Mailer/UIxMailListView.m   |  7 ++++++-
 SOGo/UI/Mailer/UIxMailListView.wox | 24 +++++++++++++++++++++---
 SOGo/UI/Mailer/Version             |  3 ++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index dc17567c..e5fca484 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+        * UIxMailListView.wox: bugfixes (v0.9.43)
+
         * v0.9.42
 
         * UIxMailListView.wox: sorting, proper handling of sort keys.
diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index cc5c9230..61b36667 100644
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -127,7 +127,12 @@ static int attachmentFlagSize = 8096;
 }
 
 - (BOOL)isSortedDescending {
-  return [[[self context] request] formValueForKey:@"desc"] ? YES : NO;
+  NSString *desc;
+  
+  desc = [[[self context] request] formValueForKey:@"desc"];
+  if(!desc)
+    return NO;
+  return [desc boolValue] ? YES : NO;
 }
 
 - (NSString *)imap4SortOrdering {
diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index 21456504..7d800cf6 100644
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -34,19 +34,31 @@
             <var:entity const:name="nbsp" />
           </td>
           <td class="tbtv_headercell" width="50%">
-	        <a href="view" _sort="subject">
+            <a href="view"
+               _sort="subject"
+               _desc="0"
+               var:queryDictionary="queryParameters"
+            >
               <var:string label:value="Subject" />
             </a>
             <var:if condition="imap4SortKey" const:value="SUBJECT">
               <var:if condition="isSortedDescending" >
-                <a href="view" _sort="subject">
+                <a href="view"
+                   _sort="subject"
+                   _desc="0"
+                   var:queryDictionary="queryParameters"
+                >
                   <img rsrc:src="title_sortup_12x12.png"
                        class="tbtv_sortcell"
                   />
                 </a>
               </var:if>
               <var:if condition="isSortedDescending" const:negate="YES" >
-                <a href="view" _sort="subject" _desc="1">
+                <a href="view"
+                   _sort="subject"
+                   _desc="1"
+                   var:queryDictionary="queryParameters"
+                >
                   <img rsrc:src="title_sortdown_12x12.png"
                        class="tbtv_sortcell"
                   />
@@ -58,6 +70,7 @@
             <var:if condition="showToAddress" const:negate="YES">
               <a href="view"
                  _sort="from"
+                 _desc="0"
                  var:queryDictionary="queryParameters"
               >
                 <var:string label:value="From" />
@@ -66,6 +79,7 @@
                 <var:if condition="isSortedDescending" >
                   <a href="view"
                      _sort="from"
+                     _desc="0"
                      var:queryDictionary="queryParameters"
                   >
                     <img rsrc:src="title_sortup_12x12.png"
@@ -89,6 +103,7 @@
             <var:if condition="showToAddress">
               <a href="view"
                  _sort="to"
+                 _desc="0"
                  var:queryDictionary="queryParameters"
               >
                 <var:string label:value="To" />
@@ -97,6 +112,7 @@
                 <var:if condition="isSortedDescending" >
                   <a href="view"
                      _sort="to"
+                     _desc="0"
                      var:queryDictionary="queryParameters"
                   >
                     <img rsrc:src="title_sortup_12x12.png"
@@ -127,6 +143,7 @@
           <td class="tbtv_headercell">
             <a href="view"
                _sort="date"
+               _desc="0"
                var:queryDictionary="queryParameters"
             >
               <var:string label:value="Date" />
@@ -135,6 +152,7 @@
               <var:if condition="isSortedDescending" >
                 <a href="view"
                    _sort="date"
+                   _desc="0"
                    var:queryDictionary="queryParameters"
                 >
                   <img rsrc:src="title_sortup_12x12.png"
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 57c3c0df..af3bd22b 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,5 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=42
+SUBMINOR_VERSION:=43
 
+# v0.9.43 requires NGObjWeb v4.3.73
 # v0.9.42 requires NGObjWeb v4.3.72
-- 
2.39.5