ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, forgot a few changes.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-02-04 13:57:49 +01:00
parent db1a84295d
commit 4a02854dec
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/XMPPConnection.h
View file

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

12
src/XMPPConnection.m
View file

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

3
src/XMPPRoster.h
View file

@ -135,7 +135,8 @@
- (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem; - (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem;
- (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem; - (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem;
- (void)XMPP_deleteRosterItem: (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; - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element;
/// \endcond /// \endcond
@end @end

6
src/XMPPRoster.m
View file

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