Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.h @ 27501: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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Wed Jun 10 04:42:11 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Mon Jul 06 04:37:41 2009 +0000 @@ -244,7 +244,7 @@ char *certificate_CN; /* A purple timeout tag for the keepalive */ - int keepalive_timeout; + guint keepalive_timeout; PurpleSrvResponse *srv_rec; guint srv_rec_idx; @@ -324,8 +324,8 @@ void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */ void jabber_remove_feature(const gchar *namespace); -/** Adds an identitiy to this jabber library instance. For list of valid values vistit the - * webiste of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ). +/** Adds an identity to this jabber library instance. For list of valid values visit the + * website of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ). * @param category the category of the identity. * @param type the type of the identity. * @param language the language localization of the name. Can be NULL.