Changeset 9ead105 for protocols/jabber/jabber.c

Timestamp:

2014-10-17T22:37:41Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fef97af

Parents:

4f7255d (diff), 46511b3 (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:

Bunch of merges from dx.

File:

• protocols/jabber/jabber.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -148 +148 @@
                 jd->fd = jd->r_inpa = jd->w_inpa = -1;
                 
-                if( strstr( jd->server, ".live.com" ) )
-                        jd->oauth2_service = &oauth2_service_mslive;
-                else if( strstr( jd->server, ".facebook.com" ) )
+                if( strstr( jd->server, ".facebook.com" ) )
                         jd->oauth2_service = &oauth2_service_facebook;
                 else