# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1006138426 0
# Node ID b715593f0d21d78588f47420728426c75ab5f479
# Parent  3e8004e0df3d5362891ad13c4118d640667c5e8d
[gaim-migrate @ 2764]
hi.

committer: Tailor Script <tailor@pidgin.im>

diff -r 3e8004e0df3d -r b715593f0d21 src/protocols/oscar/aim.h
--- a/src/protocols/oscar/aim.h	Mon Nov 19 01:01:08 2001 +0000
+++ b/src/protocols/oscar/aim.h	Mon Nov 19 02:53:46 2001 +0000
@@ -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
diff -r 3e8004e0df3d -r b715593f0d21 src/protocols/oscar/im.c
--- a/src/protocols/oscar/im.c	Mon Nov 19 01:01:08 2001 +0000
+++ b/src/protocols/oscar/im.c	Mon Nov 19 02:53:46 2001 +0000
@@ -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;
 }