Sugar API update: Use self.shared_activity not self._shared_activityHEADmaster

1 files changed, 12 insertions, 12 deletions

diff --git a/activity.py b/activity.py
index 7663d68..440f8fb 100644
--- a/activity.py
+++ b/activity.py
@@ -84,13 +84,13 @@ class ConnectActivity(Activity):
 
         self.connect('shared', self._shared_cb)
 
-        if self._shared_activity:
+        if self.shared_activity:
             # we are joining the activity
             self.buddies_panel.add_watcher(owner)
             self.connect('joined', self._joined_cb)
-            self._shared_activity.connect('buddy-joined', 
+            self.shared_activity.connect('buddy-joined', 
                                           self._buddy_joined_cb)
-            self._shared_activity.connect('buddy-left',
+            self.shared_activity.connect('buddy-left',
                                           self._buddy_left_cb)
             if self.get_shared():
                 # oh, OK, we've already joined
@@ -115,11 +115,11 @@ class ConnectActivity(Activity):
         self.initiating = True
         self._setup()
 
-        for buddy in self._shared_activity.get_joined_buddies():
+        for buddy in self.shared_activity.get_joined_buddies():
             self.buddies_panel.add_watcher(buddy)
 
-        self._shared_activity.connect('buddy-joined', self._buddy_joined_cb)
-        self._shared_activity.connect('buddy-left', self._buddy_left_cb)
+        self.shared_activity.connect('buddy-joined', self._buddy_joined_cb)
+        self.shared_activity.connect('buddy-left', self._buddy_left_cb)
 
         logger.debug('This is my activity: making a tube...')
         id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
@@ -127,13 +127,13 @@ class ConnectActivity(Activity):
         self.info_panel.show(_('Waiting for another player to join.'))
 
     def _setup(self):
-        if self._shared_activity is None:
+        if self.shared_activity is None:
             logger.error('Failed to share or join activity')
             return
 
-        self.conn = self._shared_activity.telepathy_conn
-        self.tubes_chan = self._shared_activity.telepathy_tubes_chan
-        self.text_chan = self._shared_activity.telepathy_text_chan
+        self.conn = self.shared_activity.telepathy_conn
+        self.tubes_chan = self.shared_activity.telepathy_tubes_chan
+        self.text_chan = self.shared_activity.telepathy_text_chan
 
         self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
                 'NewTube', self._new_tube_cb)
@@ -149,10 +149,10 @@ class ConnectActivity(Activity):
         if self.game is not None:
             return
 
-        if not self._shared_activity:
+        if not self.shared_activity:
             return
 
-        for buddy in self._shared_activity.get_joined_buddies():
+        for buddy in self.shared_activity.get_joined_buddies():
             self.buddies_panel.add_watcher(buddy)
 
         logger.debug('Joined an existing Connect game')