Changeset 30ce1ce for protocols/oscar

Timestamp:

2007-12-12T23:30:51Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3e79889

Parents:

d52111a

Message:

Killed the <server> parameter to "account add" and changed the default
server for OSCAR to what both login.icq.com and login.oscar.aol.com resolve
to these days. There's no need to specify a server anymore so why bother.
And cleaned up the docs (removed all references to those OSCAR servers).

Location:

protocols/oscar

Files:

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

protocols/oscar/aim.h

@@ -94 +94 @@
  *
  */
-#define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define AIM_DEFAULT_LOGIN_SERVER "login.messaging.aol.com"
 #define AIM_LOGIN_PORT 5190
 

protocols/oscar/oscar.c

@@ -341 +341 @@
         set_t *s;
         
-        s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
+        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
@@ -356 +356 @@
         struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
-        if (isdigit(acc->user[0])) {
-                odata->icq = TRUE;
-                /* This is odd but it's necessary for a proper do_import and do_export.
-                   We don't do those anymore, but let's stick with it, just in case
-                   it accidentally fixes something else too... </bitlbee> */
-                /* ic->acc->pass[8] = 0;
-                   Not touching this anymore now that it belongs to account_t!
-                   Let's hope nothing will break. ;-) */
-        } else {
+        if (!isdigit(acc->user[0])) {
                 ic->flags |= OPT_DOES_HTML;
         }
@@ -385 +377 @@
         }
         
-        if (acc->server == NULL) {
-                imcb_error(ic, "No servername specified");
-                imc_logout(ic, FALSE);
-                return;
-        }
-        
-        if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
-            g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
-                imcb_log(ic, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
-        }
-        
         imcb_log(ic, _("Signon: %s"), ic->acc->user);
 
@@ -402 +383 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, ic);
+        conn->fd = proxy_connect(set_getstr(&acc->set, "server"),
+                                 AIM_LOGIN_PORT, oscar_login_connect, ic);
         if (conn->fd < 0) {
                 imcb_error(ic, _("Couldn't connect to host"));