mirror of
https://github.com/gnustep/libs-ec.git
synced 2025-02-15 16:11:01 +00:00
passing userInfo for alarms
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@36511 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3f3d3cffeb
commit
e8243011fb
4 changed files with 13 additions and 2 deletions
|
@ -34,6 +34,7 @@
|
|||
|
||||
@class NSCoder;
|
||||
@class NSDate;
|
||||
@class NSDictionary;
|
||||
@class NSString;
|
||||
|
||||
/**
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
@class EcAlarm;
|
||||
@class GSMimeSMTPClient;
|
||||
@class NSArray;
|
||||
@class NSMutableArray;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
11
EcControl.m
11
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
|
||||
|
|
Loading…
Reference in a new issue