Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/chat
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2006-05-05 18:18:52 (GMT)
committer Dan Williams <dcbw@redhat.com>2006-05-05 18:18:52 (GMT)
commitf79570edd0ed37e96668d99c9b044bb791ddb8ef (patch)
tree0d4ab0a3b776c9d60b992e53951debaa6f8bacc1 /chat
parentca378af28663e304bfa969bdeb43b08ce138a950 (diff)
merge
Diffstat (limited to 'chat')
-rwxr-xr-xchat/chat.py2
-rw-r--r--chat/p2p.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/chat/chat.py b/chat/chat.py
index 2948c26..a5f3fc8 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -341,7 +341,7 @@ class GroupChat(Chat):
def _buddy_recv_message(self, sender, msg):
chat = sender.chat()
if not chat:
- chat = BuddyChat(self._parent, sender)
+ chat = BuddyChat(self, sender)
sender.set_chat(chat)
chat.activity_connect_to_shell()
chat.recv_message(message)
diff --git a/chat/p2p.py b/chat/p2p.py
index fb21eb9..df223d1 100644
--- a/chat/p2p.py
+++ b/chat/p2p.py
@@ -13,7 +13,7 @@ class GroupRequestHandler(object):
def message(self, message):
address = network.get_authinfo()
- self._group.recv(address, message)
+ self._group.recv(address[0], message)
class Owner:
instance = None