Monotone-Parent: e1d773b231903817edb0d556fee132ccd592c4a4

Monotone-Revision: 5b2150fb5513e0a65b7a1ee2a646d824071da645

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-03-18T19:19:44
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -422,12 +422,13 @@ static BOOL sendEMailNotifications = NO;
 {
   BOOL isOrganizerOrOwner;
   iCalRepeatableEntityObject *component;
+  NSString *organizerEmail;
 
   component = [self component: NO];
-  if (component)
+  organizerEmail = [[component organizer] email];
+  if (component && [organizerEmail length] > 0)
     isOrganizerOrOwner
-      = ([component isOrganizer: email]
-         || [[container ownerInContext: nil] isEqualToString: login]);
+      = ([organizerEmail caseInsensitiveCompare: email] == NSOrderedSame);
   else
     isOrganizerOrOwner
       = [[container ownerInContext: nil] isEqualToString: login];

UI/Scheduler/GNUmakefile

@@ -61,7 +61,8 @@ SchedulerUI_RESOURCE_FILES += \
 	Toolbars/SOGoAppointmentObjectAccept.toolbar \
 	Toolbars/SOGoAppointmentObjectDecline.toolbar \
 	Toolbars/SOGoAppointmentObjectAcceptOrDecline.toolbar \
-	Toolbars/SOGoTaskObject.toolbar
+	Toolbars/SOGoTaskObject.toolbar \
+	Toolbars/SOGoComponentClose.toolbar
 
 SchedulerUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings		\

UI/Scheduler/UIxAppointmentEditor.m

@@ -363,4 +363,25 @@
     [event setTransparency: @"OPAQUE"];
 }
 
+- (id) acceptAction
+{
+  return [self acceptOrDeclineAction:YES];
+}
+
+- (id) declineAction
+{
+  return [self acceptOrDeclineAction:NO];
+}
+
+// TODO: add tentatively
+
+- (id) acceptOrDeclineAction: (BOOL) _accept
+{
+  [[self clientObject] changeParticipationStatus:
+                         _accept ? @"ACCEPTED" : @"DECLINED"
+                       inContext: [self context]];
+
+  return self;
+}
+
 @end

UI/Scheduler/UIxTaskEditor.m

@@ -429,4 +429,25 @@
     }
 }
 
+- (id) acceptAction
+{
+  return [self acceptOrDeclineAction:YES];
+}
+
+- (id) declineAction
+{
+  return [self acceptOrDeclineAction:NO];
+}
+
+// TODO: add tentatively
+
+- (id) acceptOrDeclineAction: (BOOL) _accept
+{
+  [[self clientObject] changeParticipationStatus:
+                         _accept ? @"ACCEPTED" : @"DECLINED"
+                       inContext: [self context]];
+
+  return self;
+}
+
 @end