Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e8a09b3f e8a09b3f9ce08238cfb77ca52629f891a6ea69b4 by Sergey Poznyakoff
Options

Properly access mu-mailer and mu-message values.

1 parent 544820d6
Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
...@@ -801,7 +801,7 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0, ...@@ -801,7 +801,7 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
801 mailer_t mailer = NULL; 801 mailer_t mailer = NULL;
802 message_t msg; 802 message_t msg;
803 int status; 803 int status;
804 804
805 SCM_ASSERT (mu_scm_is_message (MESG), MESG, SCM_ARG1, FUNC_NAME); 805 SCM_ASSERT (mu_scm_is_message (MESG), MESG, SCM_ARG1, FUNC_NAME);
806 msg = mu_scm_message_get (MESG); 806 msg = mu_scm_message_get (MESG);
807 807
...@@ -812,8 +812,11 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0, ...@@ -812,8 +812,11 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
812 mailer_name = SCM_STRING_CHARS (MAILER); 812 mailer_name = SCM_STRING_CHARS (MAILER);
813 } 813 }
814 else 814 else
815 mailer_name = SCM_STRING_CHARS(_mu_scm_mailer); 815 {
816 816 SCM val = MU_SCM_SYMBOL_VALUE("mu-mailer");
817 mailer_name = SCM_STRING_CHARS(val);
818 }
819
817 if (!SCM_UNBNDP (FROM) && FROM != SCM_BOOL_F) 820 if (!SCM_UNBNDP (FROM) && FROM != SCM_BOOL_F)
818 { 821 {
819 SCM_ASSERT (SCM_NIMP (FROM) && SCM_STRINGP (FROM) 822 SCM_ASSERT (SCM_NIMP (FROM) && SCM_STRINGP (FROM)
...@@ -833,7 +836,7 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0, ...@@ -833,7 +836,7 @@ SCM_DEFINE (mu_message_send, "mu-message-send", 1, 3, 0,
833 return SCM_BOOL_F; 836 return SCM_BOOL_F;
834 } 837 }
835 838
836 if (SCM_INUM(_mu_scm_debug)) 839 if (SCM_INUM(MU_SCM_SYMBOL_VALUE("mu-debug")))
837 { 840 {
838 mu_debug_t debug = NULL; 841 mu_debug_t debug = NULL;
839 mailer_get_debug (mailer, &debug); 842 mailer_get_debug (mailer, &debug);
......