From 32363175926cbc44338c4b79c638843e321e59f0 Mon Sep 17 00:00:00 2001
From: Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>
Date: Mon, 31 Jan 2011 17:24:41 +0000
Subject: Use try/except to cope with failing Sugar imports

---
(limited to 'collaboration/presenceservice.py')

diff --git a/collaboration/presenceservice.py b/collaboration/presenceservice.py
index b6c581e..142fc4a 100644
--- a/collaboration/presenceservice.py
+++ b/collaboration/presenceservice.py
@@ -28,9 +28,13 @@ import dbus.exceptions
 import dbus.glib
 from dbus import PROPERTIES_IFACE
 
-from sugar.presence.buddy import Buddy, Owner
-from sugar.presence.activity import Activity
-from sugar.presence.connectionmanager import get_connection_manager
+""" FIXME ... """
+try:
+    from sugar.presence.buddy import Buddy, Owner
+    from sugar.presence.activity import Activity
+    from sugar.presence.connectionmanager import get_connection_manager
+except:
+    pass
 
 from telepathy.interfaces import ACCOUNT, \
                                  ACCOUNT_MANAGER, \
@@ -167,7 +171,8 @@ class PresenceService(gobject.GObject):
 
     def get_owner(self):
         """Retrieves the laptop Buddy object."""
-        return Owner()
+        #return Owner()
+        return None
 
     def __share_activity_cb(self, activity):
         """Finish sharing the activity
--
cgit v0.9.1