X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=c2172981a03886e89d12bc0e156576360f49e40f;hp=0ee85c427381959e10432914b02ca91854a0074d;hb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 0ee85c4..c217298 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -248,7 +248,7 @@ static void do_dsn_notify (smtp_message_t message, const char* from) {
   int flags = Notify_NOTSET;
   smtp_recipient_t self = NULL;
 
-  if (!DsnNotify || !*DsnNotify || !message || !from || !*from || 
+  if (m_strisempty(DsnNotify) || !message || m_strisempty(from) || 
       strstr (DsnNotify, "never") != NULL)
     return;
 
@@ -267,7 +267,7 @@ static void do_dsn_notify (smtp_message_t message, const char* from) {
 }
 
 static void do_dsn_ret (smtp_message_t message) {
-  if (!DsnReturn || !*DsnReturn || !message)
+  if (m_strisempty(DsnReturn) || !message)
     return;
   if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
     smtp_dsn_set_ret (message, Ret_HDRS);
@@ -279,7 +279,7 @@ static void do_dsn_ret (smtp_message_t message) {
 int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
                                 char* errbuf, size_t errlen) {
   char* val = (char*) p;
-  if (!val || !*val)
+  if (m_strisempty(val))
     return (1);
   if (m_strncmp(val, "enabled", 7) != 0 &&
       m_strncmp(val, "required", 8) != 0) {