gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-02-20 18:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

passing userInfo for alarms

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@36511 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-04-12 11:13:02 +00:00
parent 3f3d3cffeb
commit e8243011fb
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
EcAlarm.h
View file

@ -34,6 +34,7 @@
@class NSCoder; @class NSCoder;
@class NSDate; @class NSDate;
@class NSDictionary;
@class NSString; @class NSString;
/** /**

1
EcAlerter.h
View file

@ -29,6 +29,7 @@
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>
@class EcAlarm;
@class GSMimeSMTPClient; @class GSMimeSMTPClient;
@class NSArray; @class NSArray;
@class NSMutableArray; @class NSMutableArray;

2
EcAlerter.m
View file

@ -822,7 +822,7 @@ replaceFields(NSDictionary *fields, NSString *template)
if (nil == alarm) if (nil == alarm)
{ {
event->severity = EcAlarmSeverityIndeterminate; event->severity = EcAlarmSeverityIndeterminate;
event->severityText = nil; event->severityText = @"";
event->isClear = NO; event->isClear = NO;
if (nil != identifier) if (nil != identifier)
{ {

11
EcControl.m
View file

@ -2036,7 +2036,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
identifier = [NSString stringWithFormat: @"%d", [alarm notificationID]]; identifier = [NSString stringWithFormat: @"%d", [alarm notificationID]];
alarm = [alarm copy]; alarm = [[alarm copy] autorelease];
if (EcAlarmSeverityCleared == severity) if (EcAlarmSeverityCleared == severity)
{ {
[alarm setExtra: @"Clear"]; [alarm setExtra: @"Clear"];
@ -2047,6 +2047,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
additional, spacing2, repair, additional, spacing2, repair,
[alarm moProcess], connector, instance, [alarm moProcess], connector, instance,
component, [alarm moHost]]; component, [alarm moHost]];
[alarm setExtra: @"Clear"];
} }
else else
{ {
@ -2065,6 +2066,14 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
additional, spacing2, repair, additional, spacing2, repair,
[alarm moProcess], connector, instance, [alarm moProcess], connector, instance,
component, [alarm moHost]]; component, [alarm moHost]];
if (reminder > 0)
{
[alarm setExtra: @"Reminder"];
}
else
{
[alarm setExtra: @"Alarm"];
}
} }
[alerter handleEvent: message [alerter handleEvent: message