Author: rfm
Date: Wed May 14 23:52:58 2014
New Revision: 37880
URL: http://svn.gna.org/viewcvs/gnustep?rev=37880&view=rev
Log:
bugfix release
Modified:
libs/ec/trunk/ChangeLog
libs/ec/trunk/EcAlerter.m
libs/ec/trunk/GNUmakefile
Modified: libs/ec/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/ChangeLog?rev=37880&r1=37879&r2=37880&view=diff
==============================================================================
--- libs/ec/trunk/ChangeLog (original)
+++ libs/ec/trunk/ChangeLog Wed May 14 23:52:58 2014
@@ -1,3 +1,9 @@
+2014-05-14 Richard Frith-Macdonald <[email protected]>
+
+ * EcAlerter.m: fix bug processing alert emails
+ * GNUmakefile: bump subminor version number for release
+ Version 1.1.2 release
+
2014-05-08 Richard Frith-Macdonald <[email protected]>
* EcProcess.m: add memory commands 'class' and 'list' to record
Modified: libs/ec/trunk/EcAlerter.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcAlerter.m?rev=37880&r1=37879&r2=37880&view=diff
==============================================================================
--- libs/ec/trunk/EcAlerter.m (original)
+++ libs/ec/trunk/EcAlerter.m Wed May 14 23:52:58 2014
@@ -1182,9 +1182,32 @@
}
while ((d = [e nextObject]) != nil)
{
- NSMutableDictionary *md = [email objectForKey: d];
+ NSMutableDictionary *md;
NSString *msg;
+ if (YES == [d hasPrefix: @"{ResponsibleEmail}"])
+ {
+ NSString *s = [m objectForKey: @"ResponsibleEmail"];
+
+ if ([s length] > 0)
+ {
+ /* Use the ResponsibleEmail address from the alarm
+ */
+ d = s;
+ }
+ else
+ {
+ /* Use the fallback (remaining text in the address)
+ */
+ d = [d substringFromIndex: 18];
+ }
+ }
+ if (0 == [d length])
+ {
+ continue;
+ }
+
+ md = [email objectForKey: d];
if (md == nil)
{
md = [NSMutableDictionary new];
Modified: libs/ec/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/GNUmakefile?rev=37880&r1=37879&r2=37880&view=diff
==============================================================================
--- libs/ec/trunk/GNUmakefile (original)
+++ libs/ec/trunk/GNUmakefile Wed May 14 23:52:58 2014
@@ -25,7 +25,7 @@
-include ../local.make
PACKAGE_NAME=EnterpriseControlConfigurationLogging
-PACKAGE_VERSION=1.1.1
+PACKAGE_VERSION=1.1.2
Ec_INTERFACE_VERSION=1.1
SVN_BASE_URL=svn+ssh://svn.gna.org/svn/gnustep/libs
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
