diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-17 23:37:41 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2014-10-17 23:37:41 +0100 |
| commit | 9ead105e86e6ae332ebdcbc2f1582775b6ef6d38 (patch) | |
| tree | 9495539922feee5c5e695d445676877ec154281e /protocols/jabber/jabber.c | |
| parent | 4f7255d4bed610a77cefd9786fe13c1d673b11bb (diff) | |
| parent | 46511b3c928bea3072c8c1012b92a3057fa77517 (diff) | |
Bunch of merges from dx.
Diffstat (limited to 'protocols/jabber/jabber.c')
| -rw-r--r-- | protocols/jabber/jabber.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index dab4afdf..4b5cb3a1 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -147,9 +147,7 @@ static void jabber_login( account_t *acc ) 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 jd->oauth2_service = &oauth2_service_google; |