Changeset 0a3c243 for protocols/oscar

Timestamp:

2006-06-30T23:18:56Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5100caa

Parents:

5c9512f

Message:

Got rid of struct aim_user (now using account_t everywhere). Needs some more
testing though.

File:

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

protocols/oscar/oscar.c

@@ -356 +356 @@
 }
 
-static void oscar_login(struct aim_user *user) {
+static void oscar_login(account_t *acc) {
         aim_session_t *sess;
         aim_conn_t *conn;
         char buf[256];
-        struct gaim_connection *gc = new_gaim_conn(user);
+        struct gaim_connection *gc = new_gaim_conn(acc);
         struct oscar_data *odata = gc->proto_data = g_new0(struct oscar_data, 1);
 
-        if (isdigit(*user->username)) {
+        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... */
+                   it accidentally fixes something else too... </bitlbee> */
                 gc->password[8] = 0;
         } else {
@@ -390 +390 @@
         }
         
-        if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 &&
-            g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",user->proto_opt[USEROPT_AUTH]);
+        if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
+            g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
         }
         
@@ -402 +402 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(user->proto_opt[USEROPT_AUTH][0] ?
-                                        user->proto_opt[USEROPT_AUTH] : AIM_DEFAULT_LOGIN_SERVER,
-                                 user->proto_opt[USEROPT_AUTHPORT][0] ?
-                                        atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-                                 oscar_login_connect, gc);
+        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, gc);
         if (conn->fd < 0) {
                 hide_login_progress(gc, _("Couldn't connect to host"));
@@ -485 +481 @@
         struct aim_authresp_info *info;
         int i; char *host; int port;
-        struct aim_user *user;
         aim_conn_t *bosconn;
 
         struct gaim_connection *gc = sess->aux_data;
         struct oscar_data *od = gc->proto_data;
-        user = gc->user;
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
+        port = AIM_LOGIN_PORT;
 
         va_start(ap, fr);
@@ -871 +864 @@
         struct aim_redirect_data *redir;
         struct gaim_connection *gc = sess->aux_data;
-        struct aim_user *user = gc->user;
         aim_conn_t *tstconn;
         int i;
@@ -877 +869 @@
         int port;
 
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-
         va_start(ap, fr);
         redir = va_arg(ap, struct aim_redirect_data *);
         va_end(ap);
 
+        port = AIM_LOGIN_PORT;
         for (i = 0; i < (int)strlen(redir->ip); i++) {
                 if (redir->ip[i] == ':') {
@@ -1723 +1713 @@
         odata->rights.maxsiglen = odata->rights.maxawaymsglen = (guint)maxsiglen;
 
+        /* FIXME: It seems we're not really using this, and it broke now that
+           struct aim_user is dead.
         aim_bos_setprofile(sess, fr->conn, gc->user->user_info, NULL, gaim_caps);
-
+        */
+        
         return 1;
 }