From a39088084e778dec9915049bb516bf5ba3ccb577 Mon Sep 17 00:00:00 2001
From: dfs <dfs>
Date: Mon, 30 Mar 1998 05:08:51 +0000
Subject: [PATCH] -- Made queued reminders carry the tag around (for TkRemind)

---
 src/dorem.c  |  4 ++--
 src/protos.h |  4 ++--
 src/queue.c  | 25 +++++++++++++++++--------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/dorem.c b/src/dorem.c
index 50b3abb0..103b0c79 100644
--- a/src/dorem.c
+++ b/src/dorem.c
@@ -12,7 +12,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: dorem.c,v 1.6 1998-02-14 03:31:59 dfs Exp $";
+static char const RCSID[] = "$Id: dorem.c,v 1.7 1998-03-30 05:08:51 dfs Exp $";
 
 #include <stdio.h>
 #include <ctype.h>
@@ -115,7 +115,7 @@ ParsePtr p;
 	!(!IgnoreOnce &&
 	  trig.once != NO_ONCE &&
 	  FileAccessDate == JulianToday))
-	QueueReminder(p, trig.typ, &tim, trig.sched);
+	QueueReminder(p, &trig, &tim, trig.sched);
 /* If we're in daemon mode, do nothing over here */
     if (Daemon) return OK;
 #endif
diff --git a/src/protos.h b/src/protos.h
index 3daef5ef..7b0da87d 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -9,7 +9,7 @@
 /*                                                             */
 /***************************************************************/
 
-/* $Id: protos.h,v 1.5 1998-02-10 04:11:46 dfs Exp $ */
+/* $Id: protos.h,v 1.6 1998-03-30 05:08:52 dfs Exp $ */
 
 #ifdef HAVE_PROTOS
 #define ARGS(x) x
@@ -94,7 +94,7 @@ int PushOmitContext ARGS ((ParsePtr p));
 int PopOmitContext ARGS ((ParsePtr p));
 int IsOmitted ARGS ((int jul, int localomit));
 int DoOmit ARGS ((ParsePtr p));
-int QueueReminder ARGS ((ParsePtr p, int typ, TimeTrig *tim, const char *sched));
+int QueueReminder ARGS ((ParsePtr p, Trigger *trig, TimeTrig *tim, const char *sched));
 void HandleQueuedReminders ARGS ((void));
 char *FindInitialToken ARGS ((Token *tok, char *s));
 void FindToken ARGS ((const char *s, Token *tok));
diff --git a/src/queue.c b/src/queue.c
index 4d805b99..24e1cec8 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -10,7 +10,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: queue.c,v 1.6 1998-03-04 18:13:27 dfs Exp $";
+static char const RCSID[] = "$Id: queue.c,v 1.7 1998-03-30 05:08:52 dfs Exp $";
 
 /* We only want object code generated if we have queued reminders */
 #ifdef HAVE_QUEUED
@@ -58,6 +58,7 @@ typedef struct queuedrem {
     int ntrig;
     char *text;
     char sched[VAR_NAME_LEN+1];
+    char tag[TAG_LEN+1];
     TimeTrig tt;
 } QueuedRem;
 
@@ -83,11 +84,12 @@ PRIVATE void reread ARGS((void));
 /*                                                             */
 /***************************************************************/
 #ifdef HAVE_PROTOS
-PUBLIC int QueueReminder(ParsePtr p, int typ, TimeTrig *tim, const char *sched)
+PUBLIC int QueueReminder(ParsePtr p, Trigger *trig,
+			 TimeTrig *tim, const char *sched)
 #else
-int QueueReminder(p, typ, tim, sched)
+int QueueReminder(p, trig, tim, sched)
 ParsePtr p;
-int typ;
+Trigger *trig,
 TimeTrig *tim;
 char *sched;
 #endif
@@ -96,9 +98,9 @@ char *sched;
 
     if (DontQueue ||
 	tim->ttime == NO_TIME ||
-	typ == CAL_TYPE ||
+	trig->typ == CAL_TYPE ||
 	tim->ttime < SystemTime(0) / 60 ||
-	((typ == RUN_TYPE) && RunDisabled)) return OK;
+	((trig->typ == RUN_TYPE) && RunDisabled)) return OK;
 
     qelem = NEW(QueuedRem);
     if (!qelem) {
@@ -109,12 +111,13 @@ char *sched;
 	free(qelem);
 	return E_NO_MEM;
     }
-    qelem->typ = typ;
+    qelem->typ = trig->typ;
     qelem->tt = *tim;
     qelem->next = QueueHead;
     qelem->RunDisabled = RunDisabled;
     qelem->ntrig = 0;
     strcpy(qelem->sched, sched);
+    strcpy(qelem->tag, trig->tag);
     QueueHead = qelem;
     NumQueued++;
     return OK;
@@ -233,7 +236,13 @@ void HandleQueuedReminders()
 	if (Daemon < 0) {
 	    printf("NOTE reminder %s ",
 		   SimpleTime(q->tt.ttime));
-	    printf("%s\n", SimpleTime(SystemTime(0)/60));
+	    printf("%s ", SimpleTime(SystemTime(0)/60));
+	    if (!*q->tag) {
+		printf("*");
+	    } else {
+		printf("%s", q->tag);
+	    }
+	    printf("\n");
 	}
 #ifdef OS2_POPUP
 	(void) TriggerReminder(&p, &trig, &q->tt, JulianToday, 1);