Differences From Artifact [abde314206]:
- File
src/XMPPConnection.h
— part of check-in
[aa0dc6e2b4]
at
2012-02-03 15:46:06
on branch trunk
— Let -[checkCertificate] return a BOOL and a reason.
Throwing an exception there was strange. (user: js, size: 10224) [annotate] [blame] [check-ins using]
To Artifact [a038cc0172]:
- File src/XMPPConnection.h — part of check-in [93625a9695] at 2012-02-03 16:26:34 on branch trunk — Add xml:lang support. (user: js, size: 10401) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 | OFXMLParser *parser, *oldParser; OFXMLElementBuilder *elementBuilder, *oldElementBuilder; OFString *username, *password, *server, *resource; OFString *privateKeyFile, *certificateFile; OFString *domain, *domainToASCII; XMPPJID *JID; uint16_t port; XMPPMulticastDelegate *delegates; OFMutableDictionary *callbacks; XMPPAuthenticator *authModule; BOOL streamOpen; BOOL needsSession; BOOL encryptionRequired, encrypted; unsigned int lastID; | > | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | OFXMLParser *parser, *oldParser; OFXMLElementBuilder *elementBuilder, *oldElementBuilder; OFString *username, *password, *server, *resource; OFString *privateKeyFile, *certificateFile; OFString *domain, *domainToASCII; XMPPJID *JID; uint16_t port; OFString *language; XMPPMulticastDelegate *delegates; OFMutableDictionary *callbacks; XMPPAuthenticator *authModule; BOOL streamOpen; BOOL needsSession; BOOL encryptionRequired, encrypted; unsigned int lastID; |
︙ | ︙ | |||
166 167 168 169 170 171 172 173 174 175 176 177 178 179 | * This is useful if the address of the server is different from the domain. */ @property (copy) OFString *server; /// \brief The domain to connect to @property (copy) OFString *domain; /// \brief The resource to request for the connection @property (copy) OFString *resource; /// \brief A private key file to use for authentication @property (copy) OFString *privateKeyFile; /// \brief A certificate file to use for authentication @property (copy) OFString *certificateFile; /// \brief The JID the server assigned to the connection after binding @property (copy, readonly) XMPPJID *JID; /// \brief The port to connect to | > > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | * This is useful if the address of the server is different from the domain. */ @property (copy) OFString *server; /// \brief The domain to connect to @property (copy) OFString *domain; /// \brief The resource to request for the connection @property (copy) OFString *resource; /// \brief The language to request for the connection @property (copy) OFString *language; /// \brief A private key file to use for authentication @property (copy) OFString *privateKeyFile; /// \brief A certificate file to use for authentication @property (copy) OFString *certificateFile; /// \brief The JID the server assigned to the connection after binding @property (copy, readonly) XMPPJID *JID; /// \brief The port to connect to |
︙ | ︙ | |||
317 318 319 320 321 322 323 324 325 326 327 328 329 330 | - (void)setDomain: (OFString*)domain; - (OFString*)domain; - (void)setResource: (OFString*)resource; - (OFString*)resource; - (XMPPJID*)JID; - (void)setPort: (uint16_t)port; - (uint16_t)port; /// \cond internal - (void)XMPP_startStream; - (void)XMPP_handleStream: (OFXMLElement*)element; - (void)XMPP_handleTLS: (OFXMLElement*)element; - (void)XMPP_handleSASL: (OFXMLElement*)element; - (void)XMPP_handleStanza: (OFXMLElement*)element; | > > | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 | - (void)setDomain: (OFString*)domain; - (OFString*)domain; - (void)setResource: (OFString*)resource; - (OFString*)resource; - (XMPPJID*)JID; - (void)setPort: (uint16_t)port; - (uint16_t)port; - (void)setLanguage: (OFString*)language; - (OFString*)language; /// \cond internal - (void)XMPP_startStream; - (void)XMPP_handleStream: (OFXMLElement*)element; - (void)XMPP_handleTLS: (OFXMLElement*)element; - (void)XMPP_handleSASL: (OFXMLElement*)element; - (void)XMPP_handleStanza: (OFXMLElement*)element; |
︙ | ︙ |