Revision: 16461
Author: evands
Date: 2006-07-08 08:38:45 -0700 (Sat, 08 Jul 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16461&view=rev
Log Message:
-----------
Autoreply messages are no longer sent in response to autoreply messages
Modified Paths:
--------------
trunk/src/server.c
Modified: trunk/src/server.c
===================================================================
--- trunk/src/server.c 2006-07-08 07:27:16 UTC (rev 16460)
+++ trunk/src/server.c 2006-07-08 15:38:45 UTC (rev 16461)
@@ -557,13 +557,21 @@
lar = get_last_auto_response(gc, name);
if ((now - lar->sent) >= SECS_BEFORE_RESENDING_AUTORESPONSE)
{
+ /*
+ * We don't want to send an autoresponse in response to the other user's
+ * autoresponse. We do, however, not want to then send one in response to the
+ * _next_ message, so we still set lar->sent to now.
+ */
lar->sent = now;
+
+ if (!(flags & GAIM_MESSAGE_AUTO_RESP))
+ {
+ serv_send_im(gc, name, away_msg, GAIM_MESSAGE_AUTO_RESP);
- serv_send_im(gc, name, away_msg, GAIM_MESSAGE_AUTO_RESP);
-
- gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, away_msg,
- GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP,
- mtime);
+ gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, away_msg,
+ GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP,
+ mtime);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|