Fixing a bug with configurable polling

diff --git a/src/connection.py b/src/connection.py
index 798563d..d3951bc 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -101,8 +101,15 @@ class TheOneRingConnection(
                        raise telepathy.errors.InvalidArgument("Invalid forwarding number")
 
                # Connection init must come first
-               self.__session = gvoice.session.Session(None)
                self.__options = TheOneRingOptions(parameters)
+               self.__session = gvoice.session.Session(
+                       cookiePath = None,
+                       defaults = {
+                               "contacts": (self.__options.contactsPollPeriodInHours, "hours"),
+                               "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
+                               "texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
+                       },
+               )
                tp.Connection.__init__(
                        self,
                        constants._telepathy_protocol_name_,

diff --git a/src/gvoice/session.py b/src/gvoice/session.py
index 9f68aa8..cf6fa8c 100644 (file)
--- a/src/gvoice/session.py
+++ b/src/gvoice/session.py
@@ -29,9 +29,9 @@ class Session(object):
                else:
                        for key, (quant, unit) in defaults.iteritems():
                                if quant == 0:
-                                       defaults[key] = self._DEFAULTS[key]
+                                       defaults[key] = (self._DEFAULTS[key], unit)
                                elif quant < 0:
-                                       defaults[key] = state_machine.UpdateStateMachine.INFINITE_PERIOD
+                                       defaults[key] = (state_machine.UpdateStateMachine.INFINITE_PERIOD, unit)
                self._username = None
                self._password = None