[Pybridge-commits] SF.net SVN: pybridge: [405] trunk/pybridge/pybridge/ui/window_main.py

[<umg...@us...>]

Revision: 405
          http://svn.sourceforge.net/pybridge/?rev=405&view=rev
Author:   umgangee
Date:     2007-04-06 13:07:13 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
Remove joinTable and leaveTable methods (use the ones in NetworkClient instead).
Listen for 'joinTable' and 'leaveTable' events: when received, act accordingly.

Modified Paths:
--------------
    trunk/pybridge/pybridge/ui/window_main.py

Modified: trunk/pybridge/pybridge/ui/window_main.py
===================================================================
--- trunk/pybridge/pybridge/ui/window_main.py	2007-04-06 18:04:49 UTC (rev 404)
+++ trunk/pybridge/pybridge/ui/window_main.py	2007-04-06 20:07:13 UTC (rev 405)
@@ -96,27 +96,6 @@
         print "Error: %s" % failure.getErrorMessage()
 
 
-    def joinTable(self, tableid, host=False):
-        
-        def success(table):
-            window = self.tables.open(WindowBridgetable, id=tableid)
-            window.setTable(table)
-            
-        d = client.joinTable(tableid, host)
-        d.addCallback(success)
-        return d
-
-
-    def leaveTable(self, tableid):
-        
-        def success(r):
-            del self.tables[tableid]
-        
-        d = client.leaveTable(tableid)
-        d.addCallback(success)
-        return d
-
-
 # Event handlers.
 
 
@@ -155,6 +134,11 @@
             pass  # Ignore an unrecognised roster.
 
 
+    def event_joinTable(self, tableid, table):
+        window = self.tables.open(WindowBridgetable, id=tableid)
+        window.setTable(table)
+
+
     def event_leaveTable(self, tableid):
         self.tables.close(self.tables[tableid])  # Close window.
 
@@ -202,7 +186,8 @@
         iter = self.tableview_model.get_iter(path)
         tableid = self.tableview_model.get_value(iter, 0)
         if tableid not in client.tables:
-            self.joinTable(tableid)
+            d = client.joinTable(tableid)
+            d.addErrback(self.errback)
             self.jointable.set_property('sensitive', False)
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.