Adding the ignore file

[gc-dialer] / src / alarm_handler.py

diff --git a/src/alarm_handler.py b/src/alarm_handler.py
index 779804a..7620c21 100644 (file)
--- a/src/alarm_handler.py
+++ b/src/alarm_handler.py
@@ -16,11 +16,11 @@ _NO_ALARM = "None"
 try:
        import alarm
        ALARM_TYPE = _FREMANTLE_ALARM
-except ImportError:
+except (ImportError, OSError):
        try:
                import osso.alarmd as alarmd
                ALARM_TYPE = _DIABLO_ALARM
-       except ImportError:
+       except (ImportError, OSError):
                ALARM_TYPE = _NO_ALARM
 
 
@@ -134,16 +134,14 @@ class _FremantleAlarmHandler(object):
 
                event = alarm.Event()
                event.appid = self._TITLE
-               event.message = "GoogleVoice updates"
                event.alarm_time = alarmTime
-               event.recurrences_left = -1
+               event.recurrences_left = self._REPEAT_FOREVER
 
-               action = event.add_action(1)[0]
+               action = event.add_actions(1)[0]
                action.flags |= alarm.ACTION_TYPE_EXEC | alarm.ACTION_WHEN_TRIGGERED
                action.command = self._launcher
 
-               recurrence = event.add_recurrence(1)[0]
-               recurrence.recurrences_left = self._REPEAT_FOREVER
+               recurrence = event.add_recurrences(1)[0]
                recurrence.mask_min |= _create_recurrence_mask(recurrenceMins, 60)
                recurrence.mask_hour |= alarm.RECUR_HOUR_DONTCARE
                recurrence.mask_mday |= alarm.RECUR_MDAY_DONTCARE
@@ -252,7 +250,7 @@ class _DiabloAlarmHandler(object):
 class _NoneAlarmHandler(object):
 
        def __init__(self):
-               pass
+               self._alarmCookie = 0
 
        def load_settings(self, config, sectionName):
                pass
@@ -280,7 +278,6 @@ AlarmHandler = {
 
 
 def main():
-       import ConfigParser
        import constants
        try:
                import optparse