Protection against 0 timeout and a spelling correction

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

diff --git a/src/alarm_handler.py b/src/alarm_handler.py
index 6de0aec..98da6dc 100644 (file)
--- a/src/alarm_handler.py
+++ b/src/alarm_handler.py
@@ -38,18 +38,11 @@ class AlarmHandler(object):
        def apply_settings(self, enabled, recurrence):
                if recurrence != self._recurrence or enabled != self.isEnabled:
                        if self.isEnabled:
-                               self.delete_alarm()
+                               self._clear_alarm()
                        if enabled:
                                self._set_alarm(recurrence)
                self._recurrence = int(recurrence)
 
-       def delete_alarm(self):
-               if self._alarmCookie == self._INVALID_COOKIE:
-                       return
-               deleteResult = self._alarmdDBus.del_event(dbus.Int32(self._alarmCookie))
-               self._alarmCookie = self._INVALID_COOKIE
-               assert deleteResult != -1, "Deleting of alarm event failed"
-
        @property
        def recurrence(self):
                return self._recurrence
@@ -66,6 +59,7 @@ class AlarmHandler(object):
                return timestamp
 
        def _set_alarm(self, recurrence):
+               assert 1 <= recurrence, "Notifications set to occur too frequently: %d" % recurrence
                alarmTime = self._get_start_time(recurrence)
 
                #Setup the alarm arguments so that they can be passed to the D-Bus add_event method
@@ -92,6 +86,13 @@ class AlarmHandler(object):
 
                self._alarmCookie = self._alarmdDBus.add_event(*event);
 
+       def _clear_alarm(self):
+               if self._alarmCookie == self._INVALID_COOKIE:
+                       return
+               deleteResult = self._alarmdDBus.del_event(dbus.Int32(self._alarmCookie))
+               self._alarmCookie = self._INVALID_COOKIE
+               assert deleteResult != -1, "Deleting of alarm event failed"
+
 
 def main():
        import ConfigParser

diff --git a/src/gc_views.py b/src/gc_views.py
index 5f48097..f2576b1 100644 (file)
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -589,7 +589,7 @@ class AccountInfo(object):
                self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
 
                if self._alarmHandler is not None:
-                       self._minutesEntry.set_range(0, 60)
+                       self._minutesEntry.set_range(1, 60)
                        self._minutesEntry.set_increments(1, 5)
 
                        self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)

diff --git a/src/gv_backend.py b/src/gv_backend.py
index 00e4e87..65bc0b9 100644 (file)
--- a/src/gv_backend.py
+++ b/src/gv_backend.py
@@ -493,7 +493,7 @@ class GVDialer(object):
                @returns Iterable of (personsName, phoneNumber, exact date, relative date, action)
                """
                for action, url in (
-                       ("Recieved", self._receivedCallsURL),
+                       ("Receivead", self._receivedCallsURL),
                        ("Missed", self._missedCallsURL),
                        ("Placed", self._placedCallsURL),
                ):