Merge branch 'master' of https://github.com/robbiehanson/XMPPFramework

robbiehanson · May 3, 2013 · 8d4e45f · 8d4e45f
2 parents f9567be + ddbf12b
commit 8d4e45f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Extensions/XEP-0045/XMPPMUC.h b/Extensions/XEP-0045/XMPPMUC.h
@@ -56,7 +56,7 @@
 @protocol XMPPMUCDelegate
 @optional
 
-- (void)xmppMUC:(XMPPMUC *)sender didReceiveRoomInvitation:(XMPPMessage *)message;
-- (void)xmppMUC:(XMPPMUC *)sender didReceiveRoomInvitationDecline:(XMPPMessage *)message;
+- (void)xmppMUC:(XMPPMUC *)sender roomJID:(XMPPJID *) roomJID didReceiveInvitation:(XMPPMessage *)message;
+- (void)xmppMUC:(XMPPMUC *)sender roomJID:(XMPPJID *) roomJID didReceiveInvitationDecline:(XMPPMessage *)message;
 
 @end
diff --git a/Extensions/XEP-0045/XMPPMUC.m b/Extensions/XEP-0045/XMPPMUC.m
@@ -169,14 +169,16 @@ - (void)xmppStream:(XMPPStream *)sender didReceiveMessage:(XMPPMessage *)message
 	NSXMLElement * decline = [x elementForName:@"decline"];
 
 	NSXMLElement * directInvite = [message elementForName:@"x" xmlns:@"jabber:x:conference"];
+
+    XMPPJID * roomJID = [message from];
 
 	if (invite || directInvite)
 	{
-		[multicastDelegate xmppMUC:self didReceiveRoomInvitation:message];
+		[multicastDelegate xmppMUC:self roomJID:roomJID didReceiveInvitation:message];
 	}
 	else if (decline)
 	{
-		[multicastDelegate xmppMUC:self didReceiveRoomInvitationDecline:message];
+		[multicastDelegate xmppMUC:self roomJID:roomJID didReceiveInvitationDecline:message];
 	}
 }