diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-26 11:51:19 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-26 11:51:19 +0100 |
| commit | 5f40da79f78e444f08387ce53da1b2e471c8552f (patch) | |
| tree | ceded3c147f55b819e11503e91cc4d9e75bbcd43 /protocols/jabber/conference.c | |
| parent | 96f954df218e81f5580257c319b91217dac2f4bf (diff) | |
| parent | 644b8080349d7d42ca89946acc207592fd0acc2d (diff) | |
Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).
Diffstat (limited to 'protocols/jabber/conference.c')
| -rw-r--r-- | protocols/jabber/conference.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c index 0c2db0b3..74561d24 100644 --- a/protocols/jabber/conference.c +++ b/protocols/jabber/conference.c @@ -210,6 +210,7 @@ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bu struct groupchat *chat; struct xt_node *c; char *type = xt_find_attr( node, "type" ); + struct jabber_data *jd = ic->proto_data; struct jabber_chat *jc; char *s; @@ -251,7 +252,7 @@ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bu { if( bud == jc->me ) { - bud->ext_jid = jabber_normalize( ic->acc->user ); + bud->ext_jid = g_strdup( jd->me ); } else { |