diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-01-06 17:01:10 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-01-06 17:01:10 +0200 |
| commit | 91022df9ce5b2ffafaf1b602f028922dc77e35e4 (patch) | |
| tree | e676e5e13211eb302de0d15b908e837fbb7a2e70 | |
| parent | 284d8c5a28972234c51c8fa4a299e7f64b490d10 (diff) | |
| download | mailutils-91022df9ce5b2ffafaf1b602f028922dc77e35e4.tar.gz mailutils-91022df9ce5b2ffafaf1b602f028922dc77e35e4.tar.bz2 | |
Minor changes in scheme-related code.
* libmu_scm/mu_scm.c (_mu_scm_bugreport, mu-bugreport): New variable.
(format_table): Add pops and imaps.
* scheme/reject.scm: Minor changes.
* scheme/sieve2scm.scmi: Minor changes.
| -rw-r--r-- | libmu_scm/mu_scm.c | 10 | ||||
| -rw-r--r-- | scheme/reject.scm | 2 | ||||
| -rw-r--r-- | scheme/sieve2scm.scmi | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libmu_scm/mu_scm.c b/libmu_scm/mu_scm.c index d9c4aeeb4..9e43506ff 100644 --- a/libmu_scm/mu_scm.c +++ b/libmu_scm/mu_scm.c @@ -36,10 +36,12 @@ mu_scm_error (const char *func_name, int status, SCM _mu_scm_package_string; /* STRING: PACKAGE_STRING */ SCM _mu_scm_package; /* STRING: PACKAGE */ SCM _mu_scm_version; /* STRING: VERSION */ +SCM _mu_scm_bugreport; /* STRING: PACKAGE_BUGREPORT */ SCM _mu_scm_mailer; /* STRING: Default mailer path. */ SCM _mu_scm_debug; /* NUM: Default debug level. */ -struct format_record { +struct format_record +{ char *name; mu_record_t *record; }; @@ -49,7 +51,9 @@ static struct format_record format_table[] = { { "mh", &mu_mh_record }, { "maildir", &mu_maildir_record }, { "pop", &mu_pop_record }, + { "pops", &mu_pops_record }, { "imap", &mu_imap_record }, + { "imaps", &mu_imap_record }, { "sendmail", &mu_sendmail_record }, { "smtp", &mu_smtp_record }, { NULL, NULL }, @@ -185,6 +189,10 @@ mu_scm_init () _mu_scm_package_string = scm_from_locale_string (PACKAGE_STRING); scm_c_define ("mu-package-string", _mu_scm_package_string); scm_c_export ("mu-package-string", NULL); + + _mu_scm_bugreport = scm_from_locale_string (PACKAGE_BUGREPORT); + scm_c_define ("mu-bugreport", _mu_scm_bugreport); + scm_c_export ("mu-bugreport", NULL); /* Create MU- attribute names */ for (i = 0; attr_kw[i].name; i++) diff --git a/scheme/reject.scm b/scheme/reject.scm index a418d4b77..117031f30 100644 --- a/scheme/reject.scm +++ b/scheme/reject.scm @@ -50,7 +50,7 @@ (port (mu-message-get-port mesg "w"))) (mu-message-set-header mesg "Content-Type" "message/delivery-status") - (display (string-append "Reporting-UA: sieve; GNU " + (display (string-append "Reporting-UA: sieve; " mu-package-string "\n") port) (display (string-append "Arrival-Date: " datestr "\n") port) (newline port) diff --git a/scheme/sieve2scm.scmi b/scheme/sieve2scm.scmi index 5c9cf4911..6ab1ace5a 100644 --- a/scheme/sieve2scm.scmi +++ b/scheme/sieve2scm.scmi @@ -995,7 +995,7 @@ exec ${GUILE-guile} -l $0 -c '(mailutils-main)'\n") (exit 0)) (define (sieve-version) - (display "sieve.scm (GNU %PACKAGE% %VERSION%)") + (display "sieve2scm (GNU %PACKAGE% %VERSION%)") (newline) (exit 0)) |