From e8243011fbf1b2c7f1dfc83033d2cead065740ea Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 12 Apr 2013 11:13:02 +0000
Subject: [PATCH] passing userInfo for alarms

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@36511 72102866-910b-0410-8b05-ffd578937521
---
 EcAlarm.h   |  1 +
 EcAlerter.h |  1 +
 EcAlerter.m |  2 +-
 EcControl.m | 11 ++++++++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/EcAlarm.h b/EcAlarm.h
index 9aa195f..6c74b2c 100644
--- a/EcAlarm.h
+++ b/EcAlarm.h
@@ -34,6 +34,7 @@
 
 @class	NSCoder;
 @class	NSDate;
+@class	NSDictionary;
 @class	NSString;
 
 /**
diff --git a/EcAlerter.h b/EcAlerter.h
index 08c66fe..ca94cee 100644
--- a/EcAlerter.h
+++ b/EcAlerter.h
@@ -29,6 +29,7 @@
 
 #import <Foundation/NSObject.h>
 
+@class	EcAlarm;
 @class	GSMimeSMTPClient;
 @class	NSArray;
 @class	NSMutableArray;
diff --git a/EcAlerter.m b/EcAlerter.m
index 7eec489..fb5d98b 100644
--- a/EcAlerter.m
+++ b/EcAlerter.m
@@ -822,7 +822,7 @@ replaceFields(NSDictionary *fields, NSString *template)
       if (nil == alarm)
         {
           event->severity = EcAlarmSeverityIndeterminate;
-          event->severityText = nil;
+          event->severityText = @"";
           event->isClear = NO;
           if (nil != identifier)
             {
diff --git a/EcControl.m b/EcControl.m
index 74e2b45..faed197 100644
--- a/EcControl.m
+++ b/EcControl.m
@@ -2036,7 +2036,7 @@ static NSString*	cmdWord(NSArray* a, unsigned int pos)
 
   identifier = [NSString stringWithFormat: @"%d", [alarm notificationID]];
 
-  alarm = [alarm copy];
+  alarm = [[alarm copy] autorelease];
   if (EcAlarmSeverityCleared == severity)
     {
       [alarm setExtra: @"Clear"];
@@ -2047,6 +2047,7 @@ static NSString*	cmdWord(NSArray* a, unsigned int pos)
         additional, spacing2, repair,
         [alarm moProcess], connector, instance,
         component, [alarm moHost]];
+      [alarm setExtra: @"Clear"];
     }
   else
     {
@@ -2065,6 +2066,14 @@ static NSString*	cmdWord(NSArray* a, unsigned int pos)
         additional, spacing2, repair,
         [alarm moProcess], connector, instance,
         component, [alarm moHost]];
+      if (reminder > 0)
+        {
+          [alarm setExtra: @"Reminder"];
+        }
+      else
+        {
+          [alarm setExtra: @"Alarm"];
+        }
     }
 
   [alerter handleEvent: message