Changeset 366 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

11/28/07 17:27:26 (17 years ago)

Author:

Nicholas Riley

Message:

Info-Pester.plist: Updated for build 23.

NJRHotKey.m: Cosmetic cleanup.

PSAlarm.[hm]: Fix -[PSAlarm time] to work properly, though it no
longer has any clients.

PSSnoozeUntilController.m: Fix snooze until time being off by an hour
as displayed, or if edited, in some time zones.

PSSpeechAlert.m: Display the voice name instead of its identifier in
the description.

Pester.xcodeproj: Misc.

release-notes.html: Updated for build 23.

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (1 diff)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -247 +247 @@
 }
 
-- (NSCalendarDate *)time;
-{
+- (NSDate *)time;
+{
+    // XXX this works, but the result is unlikely to be useful until we move away from NSCalendarDate elsewhere
     if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
-    return [[NSCalendarDate alloc] initWithYear: 0
-                                          month: 1
-                                            day: 1
-                                           hour: [alarmDate hourOfDay]
-                                         minute: [alarmDate minuteOfHour]
-                                         second: [alarmDate secondOfMinute]
-                                       timeZone: nil];
+
+    NSCalendar *calendar = [NSCalendar currentCalendar];
+
+    return [calendar dateFromComponents: 
+            [calendar components: NSHourCalendarUnit|NSMinuteCalendarUnit|NSSecondCalendarUnit fromDate: alarmDate]];
 }