diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-03-25 22:50:50 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-03-25 22:50:50 (GMT) |
commit | 175e179953134cbb6a1250ed2f0377571036f789 (patch) | |
tree | c5f912be39610509554ece31babb6513847fca35 /PathsActivity.py | |
parent | 4840bac8e96acc088f4f50e4525e5947f144c3ef (diff) |
finetuning toolbar updates
Diffstat (limited to 'PathsActivity.py')
-rw-r--r-- | PathsActivity.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/PathsActivity.py b/PathsActivity.py index bbc4be1..51b3045 100644 --- a/PathsActivity.py +++ b/PathsActivity.py @@ -415,24 +415,24 @@ state=%d' % (id, initiator, type, service, params, state)) ''' Someone has joined; sharer adds them to the buddy list. ''' [nick, colors] = json_load(payload) self.status.set_label(nick + ' ' + _('has joined.')) + self._append_player(nick, colors) + if self.initiating: + payload = json_dump([self._game.buddies, self._player_colors]) + self.send_event('b|%s' % (payload)) + + def _append_player(self, nick, colors): + ''' Keep a list of players, their colors, and an XO pixbuf ''' if not nick in self._game.buddies: self._game.buddies.append(nick) self._player_colors.append(colors) self._player_pixbuf.append(svg_str_to_pixbuf( generate_xo(colors=colors))) - if self.initiating: - payload = json_dump([self._game.buddies, self._player_colors]) - self.send_event('b|%s' % (payload)) def _buddy_list(self, payload): ''' Sharer sent the updated buddy list. ''' [buddies, colors] = json_load(payload) for i, nick in enumerate(buddies): - if not nick in self._game.buddies: - self._game.buddies.append(nick) - self._player_colors.append(colors[i]) - self._player_pixbuf.append(svg_str_to_pixbuf( - generate_xo(colors=colors))) + self._append_player(nick, colors[i]) def _new_game(self, payload): ''' Sharer can start a new game. ''' |