diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-11-15 23:00:32 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-11-15 23:00:32 +0000 |
| commit | 6b96de6730acc68352e1a7bc4ef5415a4e97ed92 (patch) | |
| tree | cf1f3255eff544756e5f759035c716c802cf1756 | |
| parent | ed0589ce0af33a8e199b6bc75f55e45904c85d1c (diff) | |
Un-deprecate login.icq.com, ICQ is back on its own server thanks to the
acquisition from a while ago. I was warned about two weeks ago that this
was going to happen ... apparently sooner than expected.
| -rw-r--r-- | protocols/oscar/aim.h | 3 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/protocols/oscar/aim.h b/protocols/oscar/aim.h index d1fc602a..479f8fd0 100644 --- a/protocols/oscar/aim.h +++ b/protocols/oscar/aim.h @@ -93,7 +93,8 @@ typedef guint16 flap_seqnum_t; * the client to connect to it. * */ -#define AIM_DEFAULT_LOGIN_SERVER "login.messaging.aol.com" +#define AIM_DEFAULT_LOGIN_SERVER_AIM "login.messaging.aol.com" +#define AIM_DEFAULT_LOGIN_SERVER_ICQ "login.icq.com" #define AIM_LOGIN_PORT 5190 /* diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 3eea5825..0d23b7e8 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -368,16 +368,19 @@ static gboolean oscar_login_connect(gpointer data, gint source, b_input_conditio static void oscar_init(account_t *acc) { set_t *s; + gboolean icq = isdigit(acc->user[0]); - if (isdigit(acc->user[0])) { + if (icq) { set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc); set_add(&acc->set, "old_icq_auth", "false", set_eval_bool, acc); } - s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc); + s = set_add(&acc->set, "server", + icq ? AIM_DEFAULT_LOGIN_SERVER_ICQ + : AIM_DEFAULT_LOGIN_SERVER_AIM, set_eval_account, acc); s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY; - if(isdigit(acc->user[0])) { + if (icq) { s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc); s->flags |= ACC_SET_OFFLINE_ONLY; } |