felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't assume a potentially-colored reminder unless it's MSG/MSF/CAL type.

Browse Source
This commit is contained in:
Dianne Skoll
2020-01-14 21:43:46 -05:00
parent 3f876e792c
commit be6661d6be
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/calendar.c
View File

@@ -1073,15 +1073,7 @@ static int DoCalRem(ParsePtr p, int col)
int is_color, col_r, col_g, col_b;
is_color = (
DefaultColorR != -1
&& DefaultColorG != -1
&& DefaultColorB != -1);
if (is_color) {
col_r = DefaultColorR;
col_g = DefaultColorG;
col_b = DefaultColorB;
}
is_color = 0;
DBufInit(&buf);
DBufInit(&pre_buf);
DBufInit(&raw_buf);
@@ -1092,6 +1084,20 @@ static int DoCalRem(ParsePtr p, int col)
return r;
}
if (trig.typ == MSG_TYPE ||
trig.typ == CAL_TYPE ||
trig.typ == MSF_TYPE) {
is_color = (
DefaultColorR != -1
&& DefaultColorG != -1
&& DefaultColorB != -1);
if (is_color) {
col_r = DefaultColorR;
col_g = DefaultColorG;
col_b = DefaultColorB;
}
}
/* Don't include timed reminders in calendar if -a option supplied. */
if (DontIssueAts && tim.ttime != NO_TIME) {
FreeTrig(&trig);
@@ -1167,7 +1173,8 @@ static int DoCalRem(ParsePtr p, int col)
/* If it's a plain reminder but we have a default color, add the
three colors to the prebuf and change passthru to "COLOR" */
if (trig.typ == MSG_TYPE ||
trig.typ == CAL_TYPE) {
trig.typ == CAL_TYPE ||
trig.typ == MSF_TYPE) {
if (PsCal && is_color) {
char cbuf[24];
sprintf(cbuf, "%d %d %d ", col_r, col_g, col_b);