Minor tweeks to make it run better

git-svn-id: file:///svnroot/gc-dialer/trunk@550 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/alarm_handler.py b/src/alarm_handler.py
index 779804a..c187402 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
 
 
@@ -252,7 +252,7 @@ class _DiabloAlarmHandler(object):
 class _NoneAlarmHandler(object):
 
        def __init__(self):
-               pass
+               self._alarmCookie = 0
 
        def load_settings(self, config, sectionName):
                pass