Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/collaboration
diff options
context:
space:
mode:
authorRaul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>2011-01-31 17:24:41 (GMT)
committer Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>2011-01-31 17:39:03 (GMT)
commit32363175926cbc44338c4b79c638843e321e59f0 (patch)
treedb2b2520783bf93f91b72db0eec0afb861c331ca /collaboration
parent5c39670305846ac2abf3e8b7405e57c7511c32ff (diff)
Use try/except to cope with failing Sugar imports
Diffstat (limited to 'collaboration')
-rw-r--r--collaboration/presenceservice.py13
1 files changed, 9 insertions, 4 deletions
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