Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.h @ 27509:ebd9630ffc77
propagate from branch 'im.pidgin.pidgin' (head cec487e50b3df746ae8b23771513bf85734f618d)
to branch 'im.pidgin.cpw.darkrain42.obsolete' (head 1fc27ec0bc11e95aeff8c890ab68a5ddcb4bfb8d)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 04:41:56 +0000 |
parents | 01927ce552bc 95c56191d26c |
children | 1ea1aee71848 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Mon Jul 06 04:38:08 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Sun Jul 12 04:41:56 2009 +0000 @@ -24,7 +24,7 @@ typedef enum { JABBER_CAP_NONE = 0, - JABBER_CAP_XHTML = 1 << 0, +/* JABBER_CAP_XHTML = 1 << 0, */ /* JABBER_CAP_COMPOSING = 1 << 1, */ JABBER_CAP_SI = 1 << 2, JABBER_CAP_SI_FILE_XFER = 1 << 3, @@ -116,7 +116,6 @@ char *expected_rspauth; GHashTable *buddies; - gboolean roster_parsed; /* * This boolean was added to eliminate a heinous bug where we would