From 163bce39b5ab7afc060a5af9dfd7dafa632f7b61 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 4 Mar 2014 22:03:28 -0500
Subject: [PATCH] Fix list sorting of events by calendar name

Fixes #2629
---
 NEWS                                        | 1 +
 UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index f060b4cbb..9dce72084 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bug fixes
  - fixed an issue with ActiveSync when the number of messages in the mailbox was greater than the window-size specified by the client
  - fixed sogo-tool operations on Sieve script (#2617)
  - fixed unsubscription when renaming an IMAP folder (#2630)
+ - fixed sorting of events list by calendar name (#2629)
 
 2.2.0 (2014-02-24)
 ------------------
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index e52795e93..f59426452 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -165,7 +165,7 @@
                 <td id="eventStartHeader" class="headerCell headerDateTime sortableTableHeader"><var:string label:value="Start"/></td>
                 <td id="eventEndHeader" class="headerCell headerDateTime sortableTableHeader"><var:string label:value="End"/></td>
                 <td id="eventLocationHeader" class="headerCell headerLocation sortableTableHeader"><var:string label:value="Location"/></td>
-                <td id="calendarNameHeader" class="headerCell headerCalendarName sortableTableHeader"><var:string label:value="Calendar"/></td>
+                <td id="eventCalendarNameHeader" class="headerCell headerCalendarName sortableTableHeader"><var:string label:value="Calendar"/></td>
               </tr>
             </thead>
             <tbody><!-- events list --></tbody>