Changeset 6b96de6

Timestamp:

2010-11-15T23:00:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

10685d3

Parents:

ed0589c

Message:

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.

Location:

protocols/oscar

Files:

• aim.h (modified) (1 diff)
• oscar.c (modified) (1 diff)

protocols/oscar/aim.h

@@ -94 +94 @@
  *
  */
-#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
 

protocols/oscar/oscar.c

@@ -369 +369 @@
 {
         set_t *s;
-        
-        if (isdigit(acc->user[0])) {
+        gboolean icq = 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;