Get the Tubes working

1 files changed, 11 insertions, 12 deletions

diff --git a/activity.py b/activity.py
index 25c8753..4899b4a 100644
--- a/activity.py
+++ b/activity.py
@@ -29,6 +29,10 @@ from sugar.presence import presenceservice
 # will eventually be imported from telepathy.tubes or something
 from tubeconn import TubeConnection
 
+SERVICE = "org.laptop.HelloMesh"
+IFACE = SERVICE
+PATH = "/org/laptop/HelloMesh"
+
 logger = logging.getLogger('hellomesh-activity')
 
 class HelloMeshActivity(Activity):
@@ -155,9 +159,6 @@ class HelloMeshActivity(Activity):
         logger.error('ListTubes() failed: %s', e)
 
     def _joined_cb(self, activity):
-        if self.game is not None:
-            return
-
         if not self._shared_activity:
             return
 
@@ -178,16 +179,14 @@ class HelloMeshActivity(Activity):
                      'params=%r state=%d', id, initiator, type, service,
                      params, state)
 
-        #if (self.game is None and type == telepathy.TUBE_TYPE_DBUS and
-        #    service == SERVICE):
-        #    if state == telepathy.TUBE_STATE_LOCAL_PENDING:
-        #        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptTube(id)
+        if (type == telepathy.TUBE_TYPE_DBUS and
+            service == SERVICE):
+            if state == telepathy.TUBE_STATE_LOCAL_PENDING:
+                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptTube(id)
 
-        #    tube_conn = TubeConnection(self.conn,
-        #        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES],
-        #        id, group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
-        #    self.game = ConnectGame(tube_conn, self.grid, self.initiating,
-        #        self.buddies_panel, self.owner, self._get_buddy, self)
+            tube_conn = TubeConnection(self.conn,
+                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES],
+                id, group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
 
     def _buddy_joined_cb (self, activity, buddy):
         logger.debug('Buddy %s joined' % buddy.props.nick)