X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=0942adc9c515cfa79408a48e2d7780ad0514c586;hp=7006935ae682806e16a50f65555d02f15bb72b13;hb=5e53f9e5f65aa5b3af6f5af9d868403536534afb;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/account.c b/account.c
index 7006935..0942adc 100644
--- a/account.c
+++ b/account.c
@@ -14,6 +14,8 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
 #include "account.h"
 #include "url.h"
 
@@ -36,9 +38,9 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 
 #ifdef USE_IMAP
   if (a1->type == M_ACCT_TYPE_IMAP) {
-    if (ImapUser)
+    if (ImapUser && (ImapUser[0] != '\0'))
       user = ImapUser;
-    if (ImapLogin)
+    if (ImapLogin && (ImapLogin[0] != '\0'))
       login = ImapLogin;
   }
 #endif
@@ -144,7 +146,7 @@ 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)
+  else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser && (ImapUser[0] != '\0'))
     strfcpy (account->user, ImapUser, sizeof (account->user));
 #endif
 #ifdef USE_POP
@@ -177,7 +179,7 @@ int mutt_account_getlogin (ACCOUNT* account)
 #ifdef USE_IMAP
   else if (account->type == M_ACCT_TYPE_IMAP)
   {
-    if (ImapLogin) {
+    if (ImapLogin && (ImapLogin[0] != '\0')) {
       strfcpy (account->login, ImapLogin, sizeof (account->login));
       account->flags |= M_ACCT_LOGIN;
     }