Make use of multicast delegates in XMPPRoster.

src/XMPPConnection.m

@@ -306,7 +306,7 @@
 {
 	if (length < 1) {
 		[delegates broadcastSelector: @selector(connectionWasClosed:)
-			       forConnection: self];
+				  withObject: self];
 		return;
 	}
 
@@ -376,7 +376,7 @@
 - (void)sendStanza: (OFXMLElement*)element
 {
 	[delegates broadcastSelector: @selector(connection:didSendElement:)
-		       forConnection: self
+			  withObject: self
 			  withObject: element];
 
 	[sock writeString: [element XMLString]];
@@ -486,7 +486,7 @@
 	      forNamespace: XMPP_NS_STREAM];
 
 	[delegates broadcastSelector: @selector(connection:didReceiveElement:)
-		       forConnection: self
+			  withObject: self
 			  withObject: element];
 
 	if ([[element namespace] isEqual: XMPP_NS_CLIENT])
@@ -688,7 +688,7 @@
 
 		[delegates broadcastSelector: @selector(
 						  connectionWillUpgradeToTLS:)
-			       forConnection: self];
+				  withObject: self];
 
 		newSock = [[SSLSocket alloc] initWithSocket: sock
 					     privateKeyFile: privateKeyFile
@@ -700,7 +700,7 @@
 
 		[delegates broadcastSelector: @selector(
 						  connectionDidUpgradeToTLS:)
-			       forConnection: self];
+				  withObject: self];
 
 		/* Stream restart */
 		[self XMPP_startStream];
@@ -744,7 +744,7 @@
 
 		[delegates broadcastSelector: @selector(
 						  connectionWWasAuthenticated:)
-			       forConnection: self];
+				  withObject: self];
 
 		/* Stream restart */
 		[self XMPP_startStream];
@@ -777,7 +777,7 @@
 
 	handled = [delegates broadcastSelector: @selector(
 						    connection:didReceiveIQ:)
-				 forConnection: self
+				    withObject: self
 				    withObject: iq];
 
 	if (!handled && ![[iq type] isEqual: @"error"] &&
@@ -790,14 +790,14 @@
 - (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];
 }
 
@@ -968,7 +968,7 @@
 	}
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
-		       forConnection: self
+			  withObject: self
 			  withObject: JID];
 }
 
@@ -991,7 +991,7 @@
 		assert(0);
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)
-		       forConnection: self
+			  withObject: self
 			  withObject: JID];
 }
 

src/XMPPMulticastDelegate.h

@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "XMPPConnection.h"
+#import <ObjFW/OFObject.h>
 
 @class OFDataArray;
 
@@ -29,11 +29,11 @@
 	OFDataArray *delegates;
 }
 
-- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate;
-- (void)removeDelegate: (id <XMPPConnectionDelegate>)delegate;
+- (void)addDelegate: (id)delegate;
+- (void)removeDelegate: (id)delegate;
 - (BOOL)broadcastSelector: (SEL)selector
-	    forConnection: (XMPPConnection*)connection;
-- (BOOL)broadcastSelector: (SEL)selector
-	    forConnection: (XMPPConnection*)connection
 	       withObject: (id)object;
+- (BOOL)broadcastSelector: (SEL)selector
+	       withObject: (id)object1
+	       withObject: (id)object2;
 @end

src/XMPPMulticastDelegate.m

@@ -50,12 +50,12 @@
 	[super dealloc];
 }
 
-- (void)addDelegate: (id <XMPPConnectionDelegate>)delegate
+- (void)addDelegate: (id)delegate
 {
 	[delegates addItem: &delegate];
 }
 
-- (void)removeDelegate: (id<XMPPConnectionDelegate>)delegate
+- (void)removeDelegate: (id)delegate
 {
 	id *cArray = [delegates cArray];
 	size_t i, count = [delegates count];
@@ -69,7 +69,7 @@
 }
 
 - (BOOL)broadcastSelector: (SEL)selector
-	    forConnection: (XMPPConnection*)connection
+	       withObject: (id)object
 {
 	id *cArray = [delegates cArray];
 	size_t i, count = [delegates count];
@@ -82,15 +82,15 @@
 		BOOL (*imp)(id, SEL, id) = (BOOL(*)(id, SEL, id))
 		    [cArray[i] methodForSelector: selector];
 
-		handled |= imp(cArray[i], selector, connection);
+		handled |= imp(cArray[i], selector, object);
 	}
 
 	return handled;
 }
 
 - (BOOL)broadcastSelector: (SEL)selector
-	    forConnection: (XMPPConnection*)connection
-	       withObject: (id)object
+	       withObject: (id)object1
+	       withObject: (id)object2
 {
 	id *cArray = [delegates cArray];
 	size_t i, count = [delegates count];
@@ -103,7 +103,7 @@
 		BOOL (*imp)(id, SEL, id, id) = (BOOL(*)(id, SEL, id, id))
 		    [cArray[i] methodForSelector: selector];
 
-		handled |= imp(cArray[i], selector, connection, object);
+		handled |= imp(cArray[i], selector, object1, object2);
 	}
 
 	return handled;

src/XMPPRoster.h

@@ -28,6 +28,7 @@
 @class XMPPRosterItem;
 @class XMPPIQ;
 @class XMPPRoster;
+@class XMPPMulticastDelegate;
 
 @protocol XMPPRosterDelegate
 #ifndef XMPP_ROSTER_M
@@ -49,21 +50,17 @@
 {
 	XMPPConnection *connection;
 	OFMutableDictionary *rosterItems;
-	id <XMPPRosterDelegate, OFObject> delegate;
+	XMPPMulticastDelegate *delegates;
 }
 
-#ifdef OF_HAVE_PROPERTIES
-@property (assign) id <XMPPRosterDelegate> delegate;
-#endif
-
 - initWithConnection: (XMPPConnection*)conn;
 - (OFDictionary*)rosterItems;
 - (void)requestRoster;
 - (void)addRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)updateRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)deleteRosterItem: (XMPPRosterItem*)rosterItem;
-- (void)setDelegate: (id <XMPPRosterDelegate>)delegate;
-- (id <XMPPRosterDelegate>)delegate;
+- (void)addDelegate: (id <XMPPRosterDelegate>)delegate;
+- (void)removeDelegate: (id <XMPPRosterDelegate>)delegate;
 - (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_deleteRosterItem: (XMPPRosterItem*)rosterItem;

src/XMPPRoster.m

@@ -46,6 +46,7 @@
 		rosterItems = [[OFMutableDictionary alloc] init];
 		connection = connection_;
 		[connection addDelegate: self];
+		delegates = [[XMPPMulticastDelegate alloc] init];
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -57,6 +58,7 @@
 - (void)dealloc
 {
 	[connection removeDelegate: self];
+	[delegates release];
 	[rosterItems release];
 
 	[super dealloc];
@@ -107,10 +109,10 @@
 		else
 			[self XMPP_addRosterItem: rosterItem];
 
-		if ([delegate respondsToSelector:
-		    @selector(roster:didReceiveRosterItem:)])
-			[delegate         roster: self
-			    didReceiveRosterItem: rosterItem];
+		[delegates broadcastSelector: @selector(
+						  roster:didReceiveRosterItem:)
+				  withObject: self
+				  withObject: rosterItem];
 	}
 
 	[connection_ sendStanza: [iq resultIQ]];
@@ -172,14 +174,14 @@
 	[connection sendStanza: iq];
 }
 
-- (void)setDelegate: (id <XMPPRosterDelegate>)delegate_
+- (void)addDelegate: (id <XMPPRosterDelegate>)delegate
 {
-	delegate = (id <XMPPRosterDelegate, OFObject>)delegate_;
+	[delegates addDelegate: delegate];
 }
 
-- (id <XMPPRosterDelegate>)delegate
+- (void)removeDelegate: (id <XMPPRosterDelegate>)delegate
 {
-	return delegate;
+	[delegates removeDelegate: delegate];
 }
 
 - (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem
@@ -258,8 +260,8 @@
 			[self XMPP_addRosterItem: rosterItem];
 	}
 
-	if ([delegate respondsToSelector: @selector(rosterWasReceived:)])
-		[delegate rosterWasReceived: self];
+	[delegates broadcastSelector: @selector(rosterWasReceived:)
+			  withObject: self];
 }
 @end
 

tests/test.m

@@ -97,7 +97,7 @@ OF_APPLICATION_DELEGATE(AppDelegate)
 	roster = [[XMPPRoster alloc] initWithConnection: conn];
 
 	[conn addDelegate: self];
-	[roster setDelegate: self];
+	[roster addDelegate: self];
 
 	if ([arguments count] != 3) {
 		of_log(@"Invalid count of command line arguments!");