Changeset 1193 for trunk/auto-reply

Timestamp:

03/01/00 05:05:44 (9 years ago)

Author:

graham

Message:

Use new message id to ensure processing each individual message

Location:

trunk/auto-reply/src

Files:

• autoreply.cpp (modified) (3 diffs)
• autoreply.h (modified) (1 diff)

trunk/auto-reply/src/autoreply.cpp

@@ -178 +178 @@
   case SIGNAL_UPDATExUSER:
     if (s->SubSignal() == USER_EVENTS && s->Uin() != gUserManager.OwnerUin())
-      ProcessUserEvent(s->Uin());
+      ProcessUserEvent(s->Uin(), s->Argument());
     break;
   // We should never get any other signal
@@ -231 +231 @@
 
 
-void CLicqAutoReply::ProcessUserEvent(unsigned long nUin)
+void CLicqAutoReply::ProcessUserEvent(unsigned long nUin, unsigned long nId)
 {
   ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
   if (u == NULL)
   {
-    gLog.Warn("Invalid uin received from daemon (%ld).\n", nUin);
+    gLog.Warn("%sInvalid uin received from daemon (%ld).\n", L_AUTOREPxSTR, nUin);
     return;
   }
 
-  CUserEvent *e = NULL;
-
-  if (m_bDelete)
-  {
-    while (u->NewMessages() > 0)
-    {
-      // Fetch the event
-      e = u->EventPop();
-      // Forward it
-      if (!ForwardEvent(u, e)) break;
-      // Erase the event
-      delete e;
-    }
+  CUserEvent *e = u->EventPeekId(nId);
+
+  if (e == NULL)
+  {
+    gLog.Warn("%sInvalid message id (%d).\n", L_AUTOREPxSTR, nId);
   }
   else
   {
-    e = u->EventPeekLast();
-    // Forward it
-    ForwardEvent(u, e);
+    bool r = AutoReplyEvent(u, e);
+    if (m_bDelete && r)
+      u->EventClearId(nId);
   }
 
@@ -265 +257 @@
 
 
-bool CLicqAutoReply::ForwardEvent(ICQUser *u, CUserEvent *e)
+bool CLicqAutoReply::AutoReplyEvent(ICQUser *u, CUserEvent *e)
 {
   FILE *output;

trunk/auto-reply/src/autoreply.h

@@ -36 +36 @@
   void ProcessEvent(ICQEvent *);
 
-  void ProcessUserEvent(unsigned long);
-  bool ForwardEvent(ICQUser *, CUserEvent *);
+  void ProcessUserEvent(unsigned long, unsigned long);
+  bool AutoReplyEvent(ICQUser *, CUserEvent *);
 
 };