Oops, forgot a few changes.

src/XMPPConnection.h

@@ -343,9 +343,11 @@
 - (void)XMPP_handleMessage: (XMPPMessage*)message;
 - (void)XMPP_handlePresence: (XMPPPresence*)presence;
 - (void)XMPP_handleFeatures: (OFXMLElement*)element;
-- (void)XMPP_handleResourceBind: (XMPPIQ*)iq;
+- (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
+				      withIQ: (XMPPIQ*)iq;
 - (void)XMPP_sendSession;
-- (void)XMPP_handleSession: (XMPPIQ*)iq;
+- (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
+				 withIQ: (XMPPIQ*)iq;
 - (OFString*)XMPP_IDNAToASCII: (OFString*)domain;
 - (XMPPMulticastDelegate*)XMPP_delegates;
 /// \endcond

src/XMPPConnection.m

@@ -942,7 +942,8 @@
 
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleResourceBind:)];
+		      selector: @selector(XMPP_handleResourceBindForConnection:
+				    withIQ:)];
 }
 
 - (void)XMPP_sendStreamError: (OFString*)condition
@@ -965,7 +966,8 @@
 	[self close];
 }
 
-- (void)XMPP_handleResourceBind: (XMPPIQ*)iq
+- (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
+				      withIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *bindElement;
 	OFXMLElement *jidElement;
@@ -1001,10 +1003,12 @@
 					  namespace: XMPP_NS_SESSION]];
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleSession:)];
+		      selector: @selector(
+				    XMPP_handleSessionForConnection:withIQ:)];
 }
 
-- (void)XMPP_handleSession: (XMPPIQ*)iq
+- (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
+				 withIQ: (XMPPIQ*)iq
 {
 	if (![[iq type] isEqual: @"result"])
 		assert(0);

src/XMPPRoster.h

@@ -135,7 +135,8 @@
 - (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_deleteRosterItem: (XMPPRosterItem*)rosterItem;
-- (void)XMPP_handleInitialRoster: (XMPPIQ*)iq;
+- (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
+				       withIQ: (XMPPIQ*)iq;
 - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element;
 /// \endcond
 @end

src/XMPPRoster.m

@@ -79,7 +79,8 @@
 					  namespace: XMPP_NS_ROSTER]];
 	[connection     sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleInitialRoster:)];
+		      selector: @selector(XMPP_handleInitialRosterForConnection:
+			withIQ:)];
 }
 
 - (BOOL)connection: (XMPPConnection*)connection_
@@ -236,7 +237,8 @@
 	return rosterItem;
 }
 
-- (void)XMPP_handleInitialRoster: (XMPPIQ*)iq
+- (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
+				       withIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *rosterElement;
 	OFEnumerator *enumerator;