Changeset 0fbd3a6d for protocols/oscar/oscar.c

Timestamp:

2007-12-19T00:24:32Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

1ba7e8f

Parents:

793cc25 (diff), 2379566 (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:

Now with sending via a proxy. The proxy is automatically discovered from your
jabber server.

Also merged in revs 279..288 from upstream (e.g. PING)

File:

• protocols/oscar/oscar.c (modified) (5 diffs)

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"));
@@ -2509 +2491 @@
 }
 
-void oscar_chat_invite(struct groupchat *c, char *message, char *who)
+void oscar_chat_invite(struct groupchat *c, char *who, char *message)
 {
         struct im_connection *ic = c->ic;