Changeset c2fb3809 for protocols/oscar/oscar.c

Timestamp:

2007-04-15T22:39:35Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

84b045d

Parents:

cd4723c

Message:

Cleaned up struct im_connection. No more username/password stuff since
it's in acc too. wants_to_die is now an argument to imc_logout().

File:

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

protocols/oscar/oscar.c

@@ -263 +263 @@
                         aim_rxdispatch(odata->sess);
                                if (odata->killme)
-                                       imc_logout(ic);
+                                       imc_logout(ic, TRUE);
                 } else {
                         if ((conn->type == AIM_CONN_TYPE_BOS) ||
                                    !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
                                 imc_error(ic, _("Disconnected."));
-                                imc_logout(ic);
+                                imc_logout(ic, TRUE);
                         } else if (conn->type == AIM_CONN_TYPE_CHAT) {
                                 struct chat_connection *c = find_oscar_chat_by_conn(ic, conn);
@@ -326 +326 @@
         if (source < 0) {
                 imc_error(ic, _("Couldn't connect to host"));
-                imc_logout(ic);
+                imc_logout(ic, TRUE);
                 return FALSE;
         }
@@ -361 +361 @@
                    We don't do those anymore, but let's stick with it, just in case
                    it accidentally fixes something else too... </bitlbee> */
-                ic->password[8] = 0;
+                /* ic->acc->pass[8] = 0;
+                   Not touching this anymore now that it belongs to account_t!
+                   Let's hope nothing will break. ;-) */
         } else {
                 ic->flags |= OPT_CONN_HTML;
@@ -379 +381 @@
         if (conn == NULL) {
                 imc_error(ic, _("Unable to login to AIM"));
-                imc_logout(ic);
+                imc_logout(ic, TRUE);
                 return;
         }
@@ -385 +387 @@
         if (acc->server == NULL) {
                 imc_error(ic, "No servername specified");
-                imc_logout(ic);
+                imc_logout(ic, FALSE);
                 return;
         }
@@ -394 +396 @@
         }
         
-        imc_log(ic, _("Signon: %s"), ic->username);
+        imc_log(ic, _("Signon: %s"), ic->acc->user);
 
         aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0);
@@ -403 +405 @@
         if (conn->fd < 0) {
                 imc_error(ic, _("Couldn't connect to host"));
-                imc_logout(ic);
+                imc_logout(ic, TRUE);
                 return;
         }
-        aim_request_login(sess, conn, ic->username);
+        aim_request_login(sess, conn, ic->acc->user);
 }
 
@@ -463 +465 @@
         if (source < 0) {
                 imc_error(ic, _("Could Not Connect"));
-                imc_logout(ic);
+                imc_logout(ic, TRUE);
                 return FALSE;
         }
@@ -728 +730 @@
         va_end(ap);
 
-        aim_send_login(sess, fr->conn, ic->username, ic->password, &info, key);
+        aim_send_login(sess, fr->conn, ic->acc->user, ic->acc->pass, &info, key);
 
         return 1;
@@ -1013 +1015 @@
                 signon = time(NULL) - info->sessionlen;
 
-        tmp = g_strdup(normalize(ic->username));
+        tmp = g_strdup(normalize(ic->acc->user));
         if (!strcmp(tmp, normalize(info->sn)))
                 g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
@@ -2136 +2138 @@
                 switch(ic->permdeny) {
                 case 1:
-                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_DENYADD, ic->username);
+                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_DENYADD, ic->acc->user);
                         break;
                 case 2:
-                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_PERMITADD, ic->username);
+                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_PERMITADD, ic->acc->user);
                         break;
                 case 3:
@@ -2162 +2164 @@
                         break;
                 }
-                signoff_blocked(ic);
         } else {
                 if (od->sess->ssi.received_data)
@@ -2584 +2585 @@
         char * chatname;
         
-        chatname = g_strdup_printf("%s%d", ic->username, chat_id++);
+        chatname = g_strdup_printf("%s%d", ic->acc->user, chat_id++);
   
         ret = oscar_chat_join(ic, chatname);