From d36e20159e298ba2dbc138a5369bfa32f0a3bce1 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sat, 20 Jan 2007 12:46:32 +0000
Subject: Our xmlrpc implementation does not work with python 2.5.

Try/except it and log an error.
---
(limited to 'shell')

diff --git a/shell/model/Owner.py b/shell/model/Owner.py
index 49386a9..419b5fe 100644
--- a/shell/model/Owner.py
+++ b/shell/model/Owner.py
@@ -74,9 +74,13 @@ class ShellOwner(object):
         self._service = self._pservice.register_service(self._nick,
                 PRESENCE_SERVICE_TYPE, properties=props)
         logging.debug("Owner '%s' using port %d" % (self._nick, self._service.get_port()))
-        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")
+
+        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')
 
     def _handle_buddy_icon_request(self):
         """XMLRPC method, return the owner's icon encoded with base64."""
--
cgit v0.9.1