Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.h @ 25978:7e020fbe2cdb
propagate from branch 'im.pidgin.pidgin' (head 303af74a38e7b313d4fb0be4d4054a16cb13d819)
to branch 'im.pidgin.cpw.darkrain42.xmpp.avatars' (head 11e989f3ac36a0f958f031d55245db093923ea76)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 01:32:29 +0000 |
parents | 2d92bbe6807b 5f9a24d1c25e |
children | 242a8c97270b |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Sat Feb 14 18:23:13 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Sat Mar 07 01:32:29 2009 +0000 @@ -204,7 +204,7 @@ gboolean unregistration; PurpleAccountUnregistrationCb unregistration_cb; void *unregistration_user_data; - + gboolean vcard_fetched; /* does the local server support PEP? */ @@ -212,16 +212,16 @@ /* Is Buzz enabled? */ gboolean allowBuzz; - + /* A list of JabberAdHocCommands supported by the server */ GList *commands; - + /* last presence update to check for differences */ JabberBuddyState old_state; char *old_msg; int old_priority; char *old_avatarhash; - + /* same for user tune */ char *old_artist; char *old_title; @@ -229,9 +229,9 @@ char *old_uri; int old_length; char *old_track; - + char *certificate_CN; - + /* A purple timeout tag for the keepalive */ int keepalive_timeout;