diff options
| -rw-r--r-- | TurtleArt/tacollaboration.py (renamed from TurtleArt/collaboration.py) | 18 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/TurtleArt/collaboration.py b/TurtleArt/tacollaboration.py index b76b3c1..3760d15 100644 --- a/TurtleArt/collaboration.py +++ b/TurtleArt/tacollaboration.py @@ -3,9 +3,15 @@ from dbus.service import signal from dbus.gobject_service import ExportedGObject import logging import telepathy -from sugar import profile -from sugar.presence import presenceservice -from sugar.presence.tubeconn import TubeConnection + +try: + from sugar import profile + from sugar.presence import presenceservice + from sugar.presence.tubeconn import TubeConnection +except: + profile = None + from collaboration import presenceservice + from collaboration.tubeconn import TubeConnection SERVICE = 'org.laptop.TurtleArtActivity' IFACE = SERVICE @@ -225,7 +231,11 @@ class Collaboration(): return self._tw.nick def _get_colors(self): - return profile.get_color().to_string() + if profile: + colors = profile.get_color().to_string() + else: + colors = self._activity.get_colors() + return colors class ChatTube(ExportedGObject): diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 0799283..98968a8 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -49,7 +49,7 @@ from TurtleArt.taexportlogo import save_logo from TurtleArt.tautils import data_to_file, data_to_string, data_from_string, \ get_path, chooser from TurtleArt.tawindow import TurtleArtWindow -from TurtleArt.collaboration import Collaboration +from TurtleArt.tacollaboration import Collaboration class TurtleArtActivity(activity.Activity): |