From 14201aa76d721e3160f400fbf4a3a67cfdf38643 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 22 Dec 2009 21:07:06 +0000
Subject: [PATCH] See ChangeLog (fix for bug #234)

Monotone-Parent: c6211d892652356a678ac26ac4f287499fbe91ea
Monotone-Revision: 2c0e8a6a410ecb7bc3984b724b271bf6bbdb8947

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-12-22T21:07:06
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                   | 5 +++++
 UI/Scheduler/UIxAppointmentEditor.m         | 9 +++++++++
 UI/Templates/SchedulerUI/UIxCalMainView.wox | 5 +++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 649e17f27..c730438b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxAppointmentEditor.m (-viewAction): added
+	calendar name in returned dictionary.
+
 2009-12-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-fetchContentObjectNames):
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 2f4ce85c2..d3afc1f4a 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -455,6 +455,14 @@
   [eventDate setTimeZone: timeZone];
   co = [self clientObject];
   
+  if (!componentCalendar)
+    {
+      componentCalendar = [co container];
+      if ([componentCalendar isKindOfClass: [SOGoCalendarComponent class]])
+	componentCalendar = [componentCalendar container];
+      [componentCalendar retain];
+    }
+  
   resetAlarm = [[[context request] formValueForKey: @"resetAlarm"] boolValue];
   if (resetAlarm && [event hasAlarms] && ![event hasRecurrenceRules])
     {
@@ -483,6 +491,7 @@
 	}
     }
   data = [NSDictionary dictionaryWithObjectsAndKeys:
+		       [componentCalendar displayName], @"calendar",
 		       [event tag], @"component",
 		       [dateFormatter formattedDate: eventDate], @"startDate",
 		       [dateFormatter formattedTime: eventDate], @"startTime",
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 27469e8c1..1b6f2339d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -92,8 +92,9 @@
   <div id="eventDialog" style="display: none;" class="dialog">
     <div>
       <h1><!-- space --></h1>
-      <p id="startTime"><span class="label"><var:string label:value="Start:" /></span> <span><!-- space --></span></p>
-      <p id="location"><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Calendar:" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Start:" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
       <p id="description"><!-- space --></p>
     </div>
   </div>