diff src/protocols/oscar/conn.c @ 7285:a50eea7628cb

[gaim-migrate @ 7866] -Renamed some old functions to aim_buddylist_bleh to fit in with some of the other stuff. -Removed AIM_SESS_FLAGS_bleh and replaced sess->flags with sess->nonblocking -Made the oscar.c libfaim printf handler use a dynamic buffer instead of static committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/conn.c	Thu Oct 16 22:19:33 2003 +0000
+++ b/src/protocols/oscar/conn.c	Thu Oct 16 22:21:55 2003 +0000
@@ -532,11 +532,11 @@
 
 		fd = socket(hp->h_addrtype, SOCK_STREAM, 0);
 
-		if (sess->flags & AIM_SESS_FLAGS_NONBLOCKCONNECT)
+		if (sess->nonblocking)
 			fcntl(fd, F_SETFL, O_NONBLOCK); /* XXX save flags */
 
 		if (connect(fd, (struct sockaddr *)&sa, sizeof(struct sockaddr_in)) < 0) {
-			if (sess->flags & AIM_SESS_FLAGS_NONBLOCKCONNECT) {
+			if (sess->nonblocking) {
 				if ((errno == EINPROGRESS) || (errno == EINTR)) {
 					if (statusret)
 						*statusret |= AIM_CONN_STATUS_INPROGRESS;
@@ -856,10 +856,10 @@
  * stuff in the aim_session_t struct.
  *
  * @param sess Session to initialize.
- * @param flags Flags to use. nAny of %AIM_SESS_FLAGS %OR'd together.
+ * @param nonblocking Set to true if you want connections to be non-blocking.
  * @param debuglevel Level of debugging output (zero is least).
  */
-faim_export void aim_session_init(aim_session_t *sess, fu32_t flags, int debuglevel)
+faim_export void aim_session_init(aim_session_t *sess, bool nonblocking, int debuglevel)
 {
 
 	if (!sess)
@@ -879,7 +879,7 @@
 	sess->locate.waiting_for_response = FALSE;
 	sess->snacid_next = 0x00000001;
 
-	sess->flags = 0;
+	sess->nonblocking = nonblocking;
 	sess->debug = debuglevel;
 	sess->debugcb = defaultdebugcb;
 
@@ -895,8 +895,6 @@
 
 	sess->authinfo = NULL;
 
-	sess->flags |= flags;
-
 	/*
 	 * This must always be set.  Default to the queue-based
 	 * version for back-compatibility.