Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 91022df9 91022df9ce5b2ffafaf1b602f028922dc77e35e4 by Sergey Poznyakoff
Options

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.
1 parent 284d8c5a
Inline Side-by-side
Showing 3 changed files with 11 additions and 3 deletions
...@@ -36,10 +36,12 @@ mu_scm_error (const char *func_name, int status, ...@@ -36,10 +36,12 @@ mu_scm_error (const char *func_name, int status,
36 SCM _mu_scm_package_string; /* STRING: PACKAGE_STRING */ 36 SCM _mu_scm_package_string; /* STRING: PACKAGE_STRING */
37 SCM _mu_scm_package; /* STRING: PACKAGE */ 37 SCM _mu_scm_package; /* STRING: PACKAGE */
38 SCM _mu_scm_version; /* STRING: VERSION */ 38 SCM _mu_scm_version; /* STRING: VERSION */
39 SCM _mu_scm_bugreport; /* STRING: PACKAGE_BUGREPORT */
39 SCM _mu_scm_mailer; /* STRING: Default mailer path. */ 40 SCM _mu_scm_mailer; /* STRING: Default mailer path. */
40 SCM _mu_scm_debug; /* NUM: Default debug level. */ 41 SCM _mu_scm_debug; /* NUM: Default debug level. */
41 42
42 struct format_record { 43 struct format_record
44 {
43 char *name; 45 char *name;
44 mu_record_t *record; 46 mu_record_t *record;
45 }; 47 };
...@@ -49,7 +51,9 @@ static struct format_record format_table[] = { ...@@ -49,7 +51,9 @@ static struct format_record format_table[] = {
49 { "mh", &mu_mh_record }, 51 { "mh", &mu_mh_record },
50 { "maildir", &mu_maildir_record }, 52 { "maildir", &mu_maildir_record },
51 { "pop", &mu_pop_record }, 53 { "pop", &mu_pop_record },
54 { "pops", &mu_pops_record },
52 { "imap", &mu_imap_record }, 55 { "imap", &mu_imap_record },
56 { "imaps", &mu_imap_record },
53 { "sendmail", &mu_sendmail_record }, 57 { "sendmail", &mu_sendmail_record },
54 { "smtp", &mu_smtp_record }, 58 { "smtp", &mu_smtp_record },
55 { NULL, NULL }, 59 { NULL, NULL },
...@@ -185,6 +189,10 @@ mu_scm_init () ...@@ -185,6 +189,10 @@ mu_scm_init ()
185 _mu_scm_package_string = scm_from_locale_string (PACKAGE_STRING); 189 _mu_scm_package_string = scm_from_locale_string (PACKAGE_STRING);
186 scm_c_define ("mu-package-string", _mu_scm_package_string); 190 scm_c_define ("mu-package-string", _mu_scm_package_string);
187 scm_c_export ("mu-package-string", NULL); 191 scm_c_export ("mu-package-string", NULL);
192
193 _mu_scm_bugreport = scm_from_locale_string (PACKAGE_BUGREPORT);
194 scm_c_define ("mu-bugreport", _mu_scm_bugreport);
195 scm_c_export ("mu-bugreport", NULL);
188 196
189 /* Create MU- attribute names */ 197 /* Create MU- attribute names */
190 for (i = 0; attr_kw[i].name; i++) 198 for (i = 0; attr_kw[i].name; i++)
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 (port (mu-message-get-port mesg "w"))) 50 (port (mu-message-get-port mesg "w")))
51 (mu-message-set-header mesg "Content-Type" "message/delivery-status") 51 (mu-message-set-header mesg "Content-Type" "message/delivery-status")
52 52
53 (display (string-append "Reporting-UA: sieve; GNU " 53 (display (string-append "Reporting-UA: sieve; "
54 mu-package-string "\n") port) 54 mu-package-string "\n") port)
55 (display (string-append "Arrival-Date: " datestr "\n") port) 55 (display (string-append "Arrival-Date: " datestr "\n") port)
56 (newline port) 56 (newline port)
......
...@@ -995,7 +995,7 @@ exec ${GUILE-guile} -l $0 -c '(mailutils-main)'\n") ...@@ -995,7 +995,7 @@ exec ${GUILE-guile} -l $0 -c '(mailutils-main)'\n")
995 (exit 0)) 995 (exit 0))
996 996
997 (define (sieve-version) 997 (define (sieve-version)
998 (display "sieve.scm (GNU %PACKAGE% %VERSION%)") 998 (display "sieve2scm (GNU %PACKAGE% %VERSION%)")
999 (newline) 999 (newline)
1000 (exit 0)) 1000 (exit 0))
1001 1001
......