From c6e80efd903a1635625a8001e1a5f7e970051ddb Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 28 Oct 2011 04:00:49 +0000
Subject: catch occasional dbus error in activity.__init__ due to collaboration

---
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 8d178d0..28cefbf 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -24,6 +24,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import gobject
+import dbus
 
 import logging
 _logger = logging.getLogger('turtleart-activity')
@@ -58,10 +59,14 @@ from TurtleArt.tacollaboration import Collaboration
 
 
 class TurtleArtActivity(activity.Activity):
+    ''' Activity subclass for Turtle Art '''
 
     def __init__(self, handle):
-        ''' Activity subclass for Turtle Art '''
-        super(TurtleArtActivity, self).__init__(handle)
+        ''' Set up the toolbars, canvas, sharing, etc. '''
+        try:
+            super(TurtleArtActivity, self).__init__(handle)
+        except dbus.exceptions.DBusException, e:
+            _logger.error(str(e))
 
         self._check_ver_change(get_path(activity, 'data'))
         self._setup_visibility_handler()
--
cgit v0.9.1