diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-10-20 13:31:48 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2010-10-20 16:44:23 +0100 |
| commit | a54ccdc42de68ce9e38c9f12f08fad8b39f1665c (patch) | |
| tree | 84198d7e2eac00dcb048e02e573b521a5ff54989 | |
| parent | f5f7f03dec5874f319c4ca55e8ba1e93bc1ac11f (diff) | |
Update Wocky snapshot
This adds HTTP proxy support, along with a bunch of leak fixes and a fix
for a crash that never happens in practice. The MUC namespace constants
were renamed slightly, hence the patch here to build again.
The following two patches, cherry-picked from master, make it actually
work, too. :)
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | src/muc-channel.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 2cf2577a5465d8b13fa3d72e73cc384a68dd488 +Subproject e54631ff2db562b0b104ef9a7f949d3fb2fb8df diff --git a/src/muc-channel.c b/src/muc-channel.c index c3fa3297c..f022748be 100644 --- a/src/muc-channel.c +++ b/src/muc-channel.c @@ -2298,7 +2298,7 @@ handle_join (WockyMuc *muc, WockyStanza *accept = wocky_stanza_build ( WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_SET, NULL, NULL, - '(', "query", ':', WOCKY_NS_MUC_OWN, + '(', "query", ':', WOCKY_NS_MUC_OWNER, '(', "x", ':', WOCKY_XMPP_NS_DATA, '@', "type", "submit", ')', |