Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/message.c @ 25987:c4fd9222dda1
propagate from branch 'im.pidgin.pidgin' (head 303af74a38e7b313d4fb0be4d4054a16cb13d819)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 650d82b8a5f0c8860804dd8004cd54badea48e1e)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 07 Mar 2009 01:59:40 +0000 |
| parents | 5f9a24d1c25e 1d1d1829de11 |
| children | bc7fac8e2f79 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/message.c Thu Mar 05 23:54:50 2009 +0000 +++ b/libpurple/protocols/jabber/message.c Sat Mar 07 01:59:40 2009 +0000 @@ -1227,12 +1227,11 @@ jabber_message_free(jm); } -gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace) { +gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace) { return js->allowBuzz; } -gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname, - const gchar *namespace) +gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *namespace) { const PurpleConnection *gc = js->gc; PurpleAccount *account = purple_connection_get_account(gc);