From: Pierre Habouzit <madcoder@debian.org>
Date: Mon, 30 Oct 2006 11:11:32 +0000 (+0100)
Subject: fix regression, propably due to some changes in the string API
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=ee869a42bc5677da8e3602ec1947af1736786648

fix regression, propably due to some changes in the string API
---

diff --git a/account.c b/account.c
index 2c1eb5c..8d8a847 100644
--- a/account.c
+++ b/account.c
@@ -147,21 +147,21 @@ int mutt_account_getuser (ACCOUNT * account)
   if (account->flags & M_ACCT_USER)
     return 0;
 #ifdef USE_IMAP
-  else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser && (ImapUser[0] != '\0'))
+  else if ((account->type == M_ACCT_TYPE_IMAP) && m_strlen(ImapUser))
     strfcpy (account->user, ImapUser, sizeof (account->user));
 #endif
 #ifdef USE_POP
-  else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
+  else if ((account->type == M_ACCT_TYPE_POP) && m_strlen(PopUser))
     strfcpy (account->user, PopUser, sizeof (account->user));
 #endif
 #ifdef USE_NNTP
-  else if ((account->type == M_ACCT_TYPE_NNTP) && NntpUser)
+  else if ((account->type == M_ACCT_TYPE_NNTP) && m_strlen(NntpUser))
     strfcpy (account->user, NntpUser, sizeof (account->user));
 #endif
   /* prompt (defaults to unix username), copy into account->user */
   else {
     snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host);
-    strfcpy (account->user, NONULL (Username), sizeof (account->user));
+    strfcpy (account->user, NONULL(Username), sizeof (account->user));
     if (mutt_get_field_unbuffered (prompt, account->user,
                                     sizeof (account->user), 0))
       return -1;
@@ -205,15 +205,15 @@ int mutt_account_getpass (ACCOUNT * account)
   if (account->flags & M_ACCT_PASS)
     return 0;
 #ifdef USE_IMAP
-  else if ((account->type == M_ACCT_TYPE_IMAP) && ImapPass)
+  else if ((account->type == M_ACCT_TYPE_IMAP) && m_strlen(ImapPass))
     strfcpy (account->pass, ImapPass, sizeof (account->pass));
 #endif
 #ifdef USE_POP
-  else if ((account->type == M_ACCT_TYPE_POP) && PopPass)
+  else if ((account->type == M_ACCT_TYPE_POP) && m_strlen(PopPass))
     strfcpy (account->pass, PopPass, sizeof (account->pass));
 #endif
 #ifdef USE_NNTP
-  else if ((account->type == M_ACCT_TYPE_NNTP) && NntpPass)
+  else if ((account->type == M_ACCT_TYPE_NNTP) && m_strlen(NntpPass))
     strfcpy (account->pass, NntpPass, sizeof (account->pass));
 #endif
   else {