Changeset 5f40da7 for protocols/jabber/conference.c

Timestamp:

2011-12-26T10:51:19Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• protocols/jabber/conference.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -211 +211 @@
         struct xt_node *c;
         char *type = xt_find_attr( node, "type" );
+        struct jabber_data *jd = ic->proto_data;
         struct jabber_chat *jc;
         char *s;
@@ -252 +253 @@
                         if( bud == jc->me )
                         {
-                                bud->ext_jid = jabber_normalize( ic->acc->user );
+                                bud->ext_jid = g_strdup( jd->me );
                         }
                         else