From 0c66dd5fa29a39cf9b29541c50d33fd03a215e1d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 24 Jan 2007 14:25:31 -0500 Subject: [PATCH] Re-enable buddy streams now that XMLRPC is fixed for python 2.5 --- shell/model/Owner.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/shell/model/Owner.py b/shell/model/Owner.py index 419b5fe2..9b5ef9b4 100644 --- a/shell/model/Owner.py +++ b/shell/model/Owner.py @@ -75,12 +75,9 @@ class ShellOwner(object): PRESENCE_SERVICE_TYPE, properties=props) logging.debug("Owner '%s' using port %d" % (self._nick, self._service.get_port())) - try: - self._icon_stream = Stream.Stream.new_from_service(self._service) - self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon") - self._icon_stream.register_reader_handler(self._handle_invite, "invite") - except: - logging.error('Our xmlprc implementation does not work with Python 2.5') + self._icon_stream = Stream.Stream.new_from_service(self._service) + self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon") + self._icon_stream.register_reader_handler(self._handle_invite, "invite") def _handle_buddy_icon_request(self): """XMLRPC method, return the owner's icon encoded with base64."""