# HG changeset patch # User Mikael Berthe # Date 1289303093 -3600 # Node ID bfa507815e0ce5f1d940d8678dc0020c7918fce5 # Parent fba12c1f63869ede3fb542fcbc3642319e6566e8 Add caps to presence when joining a MUC room (Noticed by diSabler) diff -r fba12c1f6386 -r bfa507815e0c mcabber/mcabber/xmpp.c --- a/mcabber/mcabber/xmpp.c Tue Nov 09 12:09:23 2010 +0100 +++ b/mcabber/mcabber/xmpp.c Tue Nov 09 12:44:53 2010 +0100 @@ -1859,9 +1859,9 @@ return 0; } -// insert_entity_capabilities(presence_stanza) +// xmpp_insert_entity_capabilities(presence_stanza) // Entity Capabilities (XEP-0115) -static void insert_entity_capabilities(LmMessageNode *x, enum imstatus status) +void xmpp_insert_entity_capabilities(LmMessageNode *x, enum imstatus status) { LmMessageNode *y; const char *ver = entity_version(status); @@ -1922,7 +1922,7 @@ if (isonline) { const char *s_msg = (st != invisible ? msg : NULL); m = lm_message_new_presence(st, recipient, s_msg); - insert_entity_capabilities(m->node, st); // Entity Capabilities (XEP-0115) + xmpp_insert_entity_capabilities(m->node, st); // Entity Caps (XEP-0115) #ifdef HAVE_GPGME if (!do_not_sign && gpg_enabled()) { char *signature; diff -r fba12c1f6386 -r bfa507815e0c mcabber/mcabber/xmpp.h --- a/mcabber/mcabber/xmpp.h Tue Nov 09 12:09:23 2010 +0100 +++ b/mcabber/mcabber/xmpp.h Tue Nov 09 12:44:53 2010 +0100 @@ -63,6 +63,8 @@ void xmpp_send_chatstate(gpointer buddy, guint chatstate); +void xmpp_insert_entity_capabilities(LmMessageNode *x, enum imstatus status); + GSList *xmpp_get_all_storage_bookmarks(void); GSList *xmpp_get_all_storage_rosternotes(void); void xmpp_set_storage_bookmark(const char *roomid, const char *name, diff -r fba12c1f6386 -r bfa507815e0c mcabber/mcabber/xmpp_muc.c --- a/mcabber/mcabber/xmpp_muc.c Tue Nov 09 12:09:23 2010 +0100 +++ b/mcabber/mcabber/xmpp_muc.c Tue Nov 09 12:44:53 2010 +0100 @@ -147,6 +147,7 @@ // Send the XML request x = lm_message_new_presence(mystatus, roomid, mystatusmsg); + xmpp_insert_entity_capabilities(x->node, mystatus); // Entity Caps (XEP-0115) y = lm_message_node_add_child(x->node, "x", NULL); lm_message_node_set_attribute(y, "xmlns", NS_MUC); if (passwd)