[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.21,1.22 im.c,1.16,1.17

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv17680/protocols/oscar

Modified Files:
	aim.h im.c 
Log Message:
hi.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- aim.h	2001/11/18 00:21:49	1.21
+++ aim.h	2001/11/19 02:53:46	1.22
@@ -368,9 +368,10 @@
 } aim_session_t;
 
 /* Values for sess->flags */
-#define AIM_SESS_FLAGS_SNACLOGIN       0x00000001
-#define AIM_SESS_FLAGS_XORLOGIN        0x00000002
-#define AIM_SESS_FLAGS_NONBLOCKCONNECT 0x00000004
+#define AIM_SESS_FLAGS_SNACLOGIN         0x00000001
+#define AIM_SESS_FLAGS_XORLOGIN          0x00000002
+#define AIM_SESS_FLAGS_NONBLOCKCONNECT   0x00000004
+#define AIM_SESS_FLAGS_DONTTIMEOUTONICBM 0x00000008
 
 /* Valid for calling aim_icq_setstatus() and for aim_userinfo_t->icqinfo.status */
 #define AIM_ICQ_STATE_ONLINE    0x0000

Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- im.c	2001/11/14 19:21:20	1.16
+++ im.c	2001/11/19 02:53:46	1.17
@@ -226,7 +226,7 @@
 	aimbs_putraw(&fr->data, args->destsn, strlen(args->destsn));
 
 	/*
-	 * metaTLV start.
+	 * Message TLV (type 2).
 	 */
 	aimbs_put16(&fr->data, 0x0002);
 	aimbs_put16(&fr->data, msgtlvlen);
@@ -334,9 +334,8 @@
 
 	aim_tx_enqueue(sess, fr);
 
-#if 1 /* XXX do this with autoconf or something... */
-	aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */
-#endif
+	if (!(sess->flags & AIM_SESS_FLAGS_DONTTIMEOUTONICBM))
+		aim_cleansnacs(sess, 60); /* clean out SNACs over 60sec old */
 
 	return 0;
 }