@@ -304,11 +304,11 @@
 - (void)parseBuffer: (const char*)buffer
 	 withLength: (size_t)length
 {
 	if (length < 1) {
 		[delegates broadcastSelector: @selector(connectionWasClosed:)
-			       forConnection: self];
+				  withObject: self];
 		return;
 	}
 
 	[parser parseBuffer: buffer
 		 withLength: length];
@@ -374,11 +374,11 @@
 }
 
 - (void)sendStanza: (OFXMLElement*)element
 {
 	[delegates broadcastSelector: @selector(connection:didSendElement:)
-		       forConnection: self
+			  withObject: self
 			  withObject: element];
 
 	[sock writeString: [element XMLString]];
 }
 
@@ -484,11 +484,11 @@
 	[element setDefaultNamespace: XMPP_NS_CLIENT];
 	[element setPrefix: @"stream"
 	      forNamespace: XMPP_NS_STREAM];
 
 	[delegates broadcastSelector: @selector(connection:didReceiveElement:)
-		       forConnection: self
+			  withObject: self
 			  withObject: element];
 
 	if ([[element namespace] isEqual: XMPP_NS_CLIENT])
 		[self XMPP_handleStanza: element];
 
@@ -686,11 +686,11 @@
 		/* FIXME: Catch errors here */
 		SSLSocket *newSock;
 
 		[delegates broadcastSelector: @selector(
 						  connectionWillUpgradeToTLS:)
-			       forConnection: self];
+				  withObject: self];
 
 		newSock = [[SSLSocket alloc] initWithSocket: sock
 					     privateKeyFile: privateKeyFile
 					    certificateFile: certificateFile];
 		[sock release];
@@ -698,11 +698,11 @@
 
 		encrypted = YES;
 
 		[delegates broadcastSelector: @selector(
 						  connectionDidUpgradeToTLS:)
-			       forConnection: self];
+				  withObject: self];
 
 		/* Stream restart */
 		[self XMPP_startStream];
 
 		return;
@@ -742,11 +742,11 @@
 		[authModule continueWithData: [OFDataArray
 		    dataArrayWithBase64EncodedString: [element stringValue]]];
 
 		[delegates broadcastSelector: @selector(
 						  connectionWWasAuthenticated:)
-			       forConnection: self];
+				  withObject: self];
 
 		/* Stream restart */
 		[self XMPP_startStream];
 
 		return;
@@ -775,11 +775,11 @@
 		return;
 	}
 
 	handled = [delegates broadcastSelector: @selector(
 						    connection:didReceiveIQ:)
-				 forConnection: self
+				    withObject: self
 				    withObject: iq];
 
 	if (!handled && ![[iq type] isEqual: @"error"] &&
 	    ![[iq type] isEqual: @"result"]) {
 		[self sendStanza: [iq errorIQWithType: @"cancel"
@@ -788,18 +788,18 @@
 }
 
 - (void)XMPP_handleMessage: (XMPPMessage*)message
 {
 	[delegates broadcastSelector: @selector(connection:didReceiveMessage:)
-		       forConnection: self
+			  withObject: self
 			  withObject: message];
 }
 
 - (void)XMPP_handlePresence: (XMPPPresence*)presence
 {
 	[delegates broadcastSelector: @selector(connection:didReceivePresence:)
-		       forConnection: self
+			  withObject: self
 			  withObject: presence];
 }
 
 - (void)XMPP_handleFeatures: (OFXMLElement*)element
 {
@@ -966,11 +966,11 @@
 		[self XMPP_sendSession];
 		return;
 	}
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
-		       forConnection: self
+			  withObject: self
 			  withObject: JID];
 }
 
 - (void)XMPP_sendSession
 {
@@ -989,11 +989,11 @@
 {
 	if (![[iq type] isEqual: @"result"])
 		assert(0);
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
-		       forConnection: self
+			  withObject: self
 			  withObject: JID];
 }
 
 - (OFString*)XMPP_IDNAToASCII: (OFString*)domain_
 {