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.

@@ -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++)

@@ -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)

@@ -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))