@@ -381,13 +381,13 @@
 		      didSendElement: element];
 
 	[sock writeString: [element XMLString]];
 }
 
--     (void)sendIQ: (XMPPIQ*)iq
-withCallbackObject: (id)object
-	  selector: (SEL)selector
+-	(void)sendIQ: (XMPPIQ*)iq
+  withCallbackObject: (id)object
+	    selector: (SEL)selector
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	@try {
 		if (![iq ID])
 			[iq setID: [self generateStanzaID]];
@@ -402,12 +402,12 @@
 
 	[self sendStanza: iq];
 }
 
 #ifdef OF_HAVE_BLOCKS
--    (void)sendIQ: (XMPPIQ*)iq
-withCallbackBlock: (xmpp_callback_block)callback;
+-      (void)sendIQ: (XMPPIQ*)iq
+  withCallbackBlock: (xmpp_callback_block_t)callback;
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	@try {
 		if (![iq ID])
 			[iq setID: [self generateStanzaID]];
@@ -931,13 +931,13 @@
 						    namespace: XMPP_NS_BIND
 						  stringValue: resource]];
 
 	[iq addChild: bind];
 
-	[self sendIQ: iq
-  withCallbackObject: self
-	    selector: @selector(XMPP_handleResourceBind:)];
+	[self		sendIQ: iq
+	    withCallbackObject: self
+		      selector: @selector(XMPP_handleResourceBind:)];
 }
 
 - (void)XMPP_sendStreamError: (OFString*)condition
 			text: (OFString*)text
 {
@@ -990,13 +990,13 @@
 
 	iq = [XMPPIQ IQWithType: @"set"
 			     ID: [self generateStanzaID]];
 	[iq addChild: [OFXMLElement elementWithName: @"session"
 					  namespace: XMPP_NS_SESSION]];
-	[self sendIQ: iq
-  withCallbackObject: self
-	    selector: @selector(XMPP_handleSession:)];
+	[self		sendIQ: iq
+	    withCallbackObject: self
+		      selector: @selector(XMPP_handleSession:)];
 }
 
 - (void)XMPP_handleSession: (XMPPIQ*)iq
 {
 	if (![[iq type] isEqual: @"result"])