Applying feedback on the update scripts
authorEd Page <eopage@byu.net>
Mon, 8 Nov 2010 23:51:59 +0000 (17:51 -0600)
committerEd Page <eopage@byu.net>
Mon, 8 Nov 2010 23:51:59 +0000 (17:51 -0600)
src/gvoice/state_machine.py
src/tp_send_debug.py

index c4a2382..724cdc2 100644 (file)
@@ -301,7 +301,7 @@ class UpdateStateMachine(StateMachine):
                        return # not started yet
                _moduleLogger.info("%s Forcing immediate update of state machine" % (self._name, ))
                self._onTimeout.cancel()
-               self._strategy.initialize_state()
+               self._strategy.reinitialize_state()
                self._strategy.increment_state()
                nextTimeout = self._strategy.timeout
                if nextTimeout != self.INFINITE_PERIOD and nextTimeout < self._maxTime:
index 2db0a13..b5d5a7e 100755 (executable)
@@ -110,13 +110,21 @@ def _on_ensure(acct, conn, message, yours, channelObjectPath, properties):
        channel[telepathy.server.CHANNEL_TYPE_TEXT].Send(
                telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
                message,
-               reply_handler = lambda: _on_send(acct, conn, channel),
+               reply_handler = lambda: _on_send(channel),
                error_handler = _on_error,
        )
 
 
-def _on_send(acct, conn, channel):
+def _on_send(channel):
        print "Message sent"
+       channel[telepathy.server.CHANNEL].Close(
+               reply_handler = _on_channel_closed,
+               error_handler = _on_error,
+       )
+
+
+def _on_channel_closed():
+       print "Channel Closed"
        loop.quit()