diff options
Diffstat (limited to 'src/mail.c')
-rw-r--r-- | src/mail.c | 57 |
1 files changed, 35 insertions, 22 deletions
@@ -64,22 +64,25 @@ mail_send_message (mu_address_t rcpt, const char *text) mu_message_get_header (msg, &hdr); mu_header_append (hdr, "X-Mailer", x_mailer); - mu_address_to_string (rcpt, NULL, 0, &size); - buf = xmalloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - - mu_header_set_value (hdr, "To", buf, 1); - free (buf); - - if (from_address && mu_header_sget_value (hdr, "From", &sval)) + if (rcpt) { - mu_address_to_string (from_address, NULL, 0, &size); + mu_address_to_string (rcpt, NULL, 0, &size); buf = xmalloc (size + 1); - mu_address_to_string (from_address, buf, size + 1, NULL); - mu_header_set_value (hdr, "From", buf, 1); + mu_address_to_string (rcpt, buf, size + 1, NULL); + + mu_header_set_value (hdr, "To", buf, 1); free (buf); - } + if (from_address && mu_header_sget_value (hdr, "From", &sval)) + { + mu_address_to_string (from_address, NULL, 0, &size); + buf = xmalloc (size + 1); + mu_address_to_string (from_address, buf, size + 1, NULL); + mu_header_set_value (hdr, "From", buf, 1); + free (buf); + } + } + if (debug_level > 1) { mu_debug_t debug; @@ -365,6 +368,10 @@ do_notify (struct file_triplet *trp, enum notification_event ev, const char *errp; switch (ntf->tgt) { + case notify_read: + rcpt = NULL; + break; + case notify_admin: rcpt = mu_address_dup (admin_address); break; @@ -378,7 +385,7 @@ do_notify (struct file_triplet *trp, enum notification_event ev, trp, &errp); } - if (!rcpt) + if (!rcpt && ntf->tgt != notify_read) { logmsg (LOG_ERR, _("not notifying %s (project %s) about %s: %s"), notification_target_str (ntf->tgt), @@ -389,16 +396,22 @@ do_notify (struct file_triplet *trp, enum notification_event ev, if (debug_level) { - size_t size; - char *buf; - mu_address_to_string (rcpt, NULL, 0, &size); - buf = xmalloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), - buf, trp->project, notification_event_str (ev)); - free (buf); + if (rcpt) + { + size_t size; + char *buf; + mu_address_to_string (rcpt, NULL, 0, &size); + buf = xmalloc (size + 1); + mu_address_to_string (rcpt, buf, size + 1, NULL); + logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), + buf, trp->project, notification_event_str (ev)); + free (buf); + } + else + logmsg (LOG_DEBUG, _("notifying message recipients (project %s) about %s"), + trp->project, notification_event_str (ev)); } - + if (!dry_run_mode) { const char *msg = resolve_message_template (ntf->msg); |