diff src/protocols/oscar/conn.c @ 7466:fa0324675ed9

[gaim-migrate @ 8079] This might fix the "user info for null unavailable," or whatever. Let me know when it doesn't. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/conn.c	Sun Nov 09 06:12:06 2003 +0000
+++ b/src/protocols/oscar/conn.c	Sun Nov 09 07:58:23 2003 +0000
@@ -191,11 +191,9 @@
 }
 
 /**
- * aim_connrst - Clears out connection list, killing remaining connections.
- * @sess: Session to be cleared
+ * Clears out connection list, killing remaining connections.
  *
- * Clears out the connection list and kills any connections left.
- *
+ * @param sess Session to be cleared
  */
 static void aim_connrst(aim_session_t *sess)
 {
@@ -217,11 +215,10 @@
 }
 
 /**
- * aim_conn_init - Reset a connection to default values.
- * @deadconn: Connection to be reset
- *
+ * Reset a connection to default values.
  * Initializes and/or resets a connection structure.
  *
+ * @param deadconn Connection to be reset
  */
 static void aim_conn_init(aim_conn_t *deadconn)
 {
@@ -871,20 +868,16 @@
 	sess->queue_incoming = NULL;
 	aim_initsnachash(sess);
 	sess->msgcookies = NULL;
-	sess->icq_info = NULL;
-	sess->oft_info = NULL;
-	sess->emailinfo = NULL;
-	sess->locate.userinfo = NULL;
-	sess->locate.request_queue = NULL;
-	sess->locate.waiting_for_response = FALSE;
-	sess->snacid_next = 0x00000001;
-
 	sess->nonblocking = nonblocking;
 	sess->debug = debuglevel;
 	sess->debugcb = defaultdebugcb;
+	sess->modlistv = NULL;
+	sess->snacid_next = 0x00000001;
 
-	sess->modlistv = NULL;
-
+	sess->locate.userinfo = NULL;
+	sess->locate.torequest = NULL;
+	sess->locate.requested = NULL;
+	sess->locate.waiting_for_response = FALSE;
 	sess->ssi.received_data = 0;
 	sess->ssi.numitems = 0;
 	sess->ssi.official = NULL;
@@ -892,8 +885,10 @@
 	sess->ssi.pending = NULL;
 	sess->ssi.timestamp = (time_t)0;
 	sess->ssi.waiting_for_ack = 0;
-
+	sess->icq_info = NULL;
 	sess->authinfo = NULL;
+	sess->emailinfo = NULL;
+	sess->oft_info = NULL;
 
 	/*
 	 * This must always be set.  Default to the queue-based
@@ -901,7 +896,6 @@
 	 */
 	aim_tx_setenqueue(sess, AIM_TX_QUEUED, NULL);
 
-
 	/*
 	 * Register all the modules for this session...
 	 */