From 4fe4cd700ac9fea0f9f5821cc03121b74767d865 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 7 Aug 2007 21:19:02 +0000
Subject: [PATCH] Monotone-Parent: 53c362ab89243a59da15d541f8c19d708447e107
 Monotone-Revision: f2ad0d0ba43feee8b989d79cf1cdceae7fb74a75

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-07T21:19:02
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                      | 6 ++++++
 SoObjects/Appointments/SOGoCalendarComponent.m | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3d667884..d7acd4f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-08-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent
+	-sendEMailUsingTemplateNamed:_pageNameforOldObject:_oldObjectandNewObject:_newObjecttoAttendees:_attendees]):
+	set the mail date to the current date string returned by our
+	rfc822DateString extension method.
+
 	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
 	-_gcsFoldersFromFolder:): ignore the personal folders who are
 	returned but don't really exist.
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index c77601288..50e2c4758 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -34,6 +34,7 @@
 #import <NGMail/NGSendMail.h>
 
 #import <SoObjects/SOGo/LDAPUserManager.h>
+#import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
@@ -337,7 +338,7 @@ static BOOL sendEMailNotifications = NO;
   iCalPerson *attendee;
   NSString *recipient;
   SOGoAptMailNotification *p;
-  NSString *subject, *text, *header;
+  NSString *mailDate, *subject, *text, *header;
   NGMutableHashMap *headerMap;
   NGMimeMessage *msg;
   NGMimeBodyPart *bodyPart;
@@ -408,7 +409,8 @@ static BOOL sendEMailNotifications = NO;
           [headerMap setObject: @"multipart/mixed" forKey: @"content-type"];
           [headerMap setObject: sender forKey: @"From"];
           [headerMap setObject: recipient forKey: @"To"];
-          [headerMap setObject: [NSCalendarDate date] forKey: @"date"];
+	  mailDate = [[NSCalendarDate date] rfc822DateString];
+          [headerMap setObject: mailDate forKey: @"date"];
           [headerMap setObject: subject forKey: @"Subject"];
           msg = [NGMimeMessage messageWithHeader: headerMap];