Changeset 1120 for trunk/auto-reply

Timestamp:

02/22/00 04:36:51 (9 years ago)

Author:

graham

Message:

Added delete new messages option to not automatically delete new messages
after auto-replying to them.

Location:

trunk/auto-reply

Files:

• configure.in (modified) (1 diff)
• src/autoreply.cpp (modified) (3 diffs)
• src/autoreply.h (modified) (3 diffs)
• src/main.cpp (modified) (3 diffs)

trunk/auto-reply/configure.in

@@ -6 +6 @@
 
 dnl All versioning is done via the following line
-AM_INIT_AUTOMAKE(Licq-AutoReply, 0.12)
+AM_INIT_AUTOMAKE(Licq-AutoReply, 0.15)
 AM_CONFIG_HEADER(config.h)
 

trunk/auto-reply/src/autoreply.cpp

@@ -29 +29 @@
  * CLicqAutoReply::Constructor
  *-------------------------------------------------------------------------*/
-CLicqAutoReply::CLicqAutoReply(bool _bEnable, char *_szStatus)
+CLicqAutoReply::CLicqAutoReply(bool _bEnable, bool _bDelete, char *_szStatus)
 {
   tcp = new TCPSocket;
   m_bExit = false;
   m_bEnabled = _bEnable;
+  m_bDelete = _bDelete;
   m_szStatus = _szStatus == NULL ? NULL : strdup(_szStatus);
 }
@@ -241 +242 @@
 
   CUserEvent *e = NULL;
-  while (u->NewMessages() > 0)
-  {
-    // Fetch the event
-    e = u->GetEvent(0);
+
+  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;
+    }
+  }
+  else
+  {
+    e = u->EventPeekLast();
     // Forward it
-    if (!ForwardEvent(u, e)) break;
-    // Erase the event
-    u->ClearEvent(0);
+    ForwardEvent(u, e);
   }
 
@@ -261 +272 @@
   char c;
   int pos = 0;
+
+  if (e == NULL) return false;
+
   for (int i = 0; i < 4096; i++)
   {

trunk/auto-reply/src/autoreply.h

@@ -16 +16 @@
 {
 public:
-  CLicqAutoReply(bool, char *);
+  CLicqAutoReply(bool, bool, char *);
   ~CLicqAutoReply();
   int Run(CICQDaemon *);
@@ -24 +24 @@
 protected:
   int m_nPipe;
-  bool m_bExit, m_bEnabled;
+  bool m_bExit, m_bEnabled, m_bDelete;
   char *m_szStatus;
   char m_szProgram[512];
@@ -38 +38 @@
   void ProcessUserEvent(unsigned long);
   bool ForwardEvent(ICQUser *, CUserEvent *);
-//  bool ForwardEvent_ICQ(ICQUser *, CUserEvent *);
 
 };

trunk/auto-reply/src/main.cpp

@@ -13 +13 @@
 {
   static const char usage[] =
-    "Usage:  Licq [options] -p autoreply -- [ -h ] [ -e ] [ -l <staus> ]\n"
+    "Usage:  Licq [options] -p autoreply -- [ -h ] [ -e ] [ -l <staus> ] [ -d ]\n"
     "         -h          : help\n"
     "         -e          : start enabled\n"
-    "         -l <status> : log on at startup\n";
+    "         -l <status> : log on at startup\n"
+    "         -d          : delete messages after auto-replying\n";
   return usage;
 }
@@ -36 +37 @@
 const char *LP_Version()
 {
-  static const char version[] = "0.10";
+  static const char version[] = "0.15";
   return version;
 }
@@ -56 +57 @@
 
   // parse command line for arguments
-  bool bEnable = false;
+  bool bEnable = false, bDelete = false;
   char *szStatus = NULL;
   int i = 0;
-  while( (i = getopt(argc, argv, "hel:")) > 0)
+  while( (i = getopt(argc, argv, "dhel:")) > 0)
   {
     switch (i)
     {
-    case 'h':  // help
-      LP_Usage();
-      return false;
-    case 'e': // enable
-      bEnable = true;
-      break;
-    case 'l': //log on
-      szStatus = strdup(optarg);
-      break;
+      case 'h':  // help
+        LP_Usage();
+        return false;
+      case 'e': // enable
+        bEnable = true;
+        break;
+      case 'l': //log on
+        szStatus = strdup(optarg);
+        break;
+      case 'd': // delete new
+        bDelete = true;
+        break;
     }
   }
-  licqAutoReply = new CLicqAutoReply(bEnable, szStatus);
+  licqAutoReply = new CLicqAutoReply(bEnable, bDelete, szStatus);
   if (szStatus != NULL) free(szStatus);
   return (licqAutoReply != NULL);