From d4180f53758e654d495a43fb0774aa911f8dea02 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sun, 15 Jul 2007 21:30:15 +0000
Subject: - (activity.py _buddy_joined_cb) Fix when buddy who joins is empty

- (activity.py _joined_cb) Fix when myself is not in the buddies list.
- (messenger.py load_game) Fix when joining a game which is already running that the current player is sent. Need to send the cards that has been chosen already as well.
- (game.py) Removed the old readconfig
---
(limited to 'activity.py')

diff --git a/activity.py b/activity.py
index d9bbdb7..bb8c101 100755
--- a/activity.py
+++ b/activity.py
@@ -112,6 +112,8 @@ class MemorizeActivity(Activity):
         # Owner.props.key
         if self._shared_activity:
             # We are joining the activity
+            # _logger.debug("Joined activity, add myself to buddy list nick=%s" %self.owner.props.nick)          
+            # self.game.add_buddy(self.owner)
             self.connect('joined', self._joined_cb)
             if self.get_shared():
                 # We've already joined
@@ -198,12 +200,20 @@ class MemorizeActivity(Activity):
     def _joined_cb(self, activity):
         if not self._shared_activity:
             return
-        
+
+        _logger.debug('Joined an existing shared activity')
+
+        self.found = 0
         for buddy in self._shared_activity.get_joined_buddies():
-            _logger.debug("buddy joined - _joined_cb: %s", buddy.props.nick)
+            _logger.debug("buddy joined - _joined_cb: %s  (get buddies of activity and add them to my list)", buddy.props.nick)
             self.game.add_buddy(buddy)
+            if buddy == self.owner:
+                self.found = 1
+
+        if self.found == 0:
+            _logger.debug("buddy joined - _joined_cb: Not foud myself in buddy list - will add myself at end of the list.")
+            self.game.add_buddy(self.owner)
 
-        _logger.debug('Joined an existing shared activity')
         self.initiating = False
         self._setup()
         
@@ -248,9 +258,15 @@ class MemorizeActivity(Activity):
              
     def _buddy_joined_cb (self, activity, buddy):
         if buddy <> self.owner:
-            _logger.debug("buddy joined - _buddy_joined_cb: %s", buddy.props.nick)
-            self.game.add_buddy(buddy)
+            if buddy.props.nick == '':
+                _logger.debug("buddy joined - _buddy_joined_cb: buddy name empty nick=%s. Will not add." %(buddy.props.nick))
+            else:
+                _logger.debug("buddy joined - _buddy_joined_cb: %s", buddy.props.nick)
+                self.game.add_buddy(buddy)
 
     def _buddy_left_cb (self, activity, buddy):
-        _logger.debug("buddy left - _buddy_left_cb: %s", buddy.props.nick)
-        self.game.rem_buddy(buddy)
+        if buddy.props.nick == '':
+            _logger.debug("buddy joined - _buddy_left_cb: buddy name empty nick=%s. Will not remove" %(buddy.props.nick))
+        else:
+            _logger.debug("buddy left - _buddy_left_cb: %s", buddy.props.nick)
+            self.game.rem_buddy(buddy)
--
cgit v0.9.1