comparison libpurple/protocols/jabber/jabber.h @ 27577:6d26258e9f1d

propagate from branch 'im.pidgin.pidgin' (head ac87c285c7056f86005dc157b9870745de471f74) to branch 'im.pidgin.cpw.darkrain42.roster' (head 976d874853ac9745edb77d3cf107b92ebc037c10)
author Paul Aurich <paul@darkrain42.org>
date Mon, 06 Jul 2009 04:37:41 +0000
parents c8390dc125c1 d3b6776186ce
children 95c56191d26c
comparison
equal deleted inserted replaced
27576:b9da56683499 27577:6d26258e9f1d
242 char *old_track; 242 char *old_track;
243 243
244 char *certificate_CN; 244 char *certificate_CN;
245 245
246 /* A purple timeout tag for the keepalive */ 246 /* A purple timeout tag for the keepalive */
247 int keepalive_timeout; 247 guint keepalive_timeout;
248 248
249 PurpleSrvResponse *srv_rec; 249 PurpleSrvResponse *srv_rec;
250 guint srv_rec_idx; 250 guint srv_rec_idx;
251 guint max_srv_rec_idx; 251 guint max_srv_rec_idx;
252 252
322 char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason); 322 char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason);
323 323
324 void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */ 324 void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
325 void jabber_remove_feature(const gchar *namespace); 325 void jabber_remove_feature(const gchar *namespace);
326 326
327 /** Adds an identitiy to this jabber library instance. For list of valid values vistit the 327 /** Adds an identity to this jabber library instance. For list of valid values visit the
328 * webiste of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ). 328 * website of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
329 * @param category the category of the identity. 329 * @param category the category of the identity.
330 * @param type the type of the identity. 330 * @param type the type of the identity.
331 * @param language the language localization of the name. Can be NULL. 331 * @param language the language localization of the name. Can be NULL.
332 * @param name the name of the identity. 332 * @param name the name of the identity.
333 */ 333 */