merge

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)

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