Rocco Rutte:

- merge in latest mutt changes

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@328 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 1288aa5..926d9d4 100644 (file)
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,8 @@
+2005-07-17 00:43:05  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+       * account.c: Don't dereference null ImapUser in new getlogin
+       function.
+

 2005-07-15 07:29:37  Vincent Lefevre  <vincent@vinc17.org>  (brendan)
 
        * po/fr.po: PO update 20050613.
 2005-07-15 07:29:37  Vincent Lefevre  <vincent@vinc17.org>  (brendan)
 
        * po/fr.po: PO update 20050613.


@@ -456,7 +461,7 @@
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
                                  
      * hcache.c: - make hcache.c conform to mutt codingstyle
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
                                  
      * hcache.c: - make hcache.c conform to mutt codingstyle

-     - use $Id: ChangeLog,v 3.431 2005/07/15 07:31:04 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword
+     - use $Id: ChangeLog,v 3.432 2005/07/17 00:44:49 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword

                                  
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
 
                                  
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
 

diff --git a/account.c b/account.c
index 0499e0c..ca7a729 100644 (file)
--- a/account.c
+++ b/account.c
@@ -178,8 +178,10 @@ int mutt_account_getlogin (ACCOUNT* account)
   {
     if (ImapLogin)
       strfcpy (account->login, ImapLogin, sizeof (account->login));
   {
     if (ImapLogin)
       strfcpy (account->login, ImapLogin, sizeof (account->login));

-    else
-      strfcpy (account->login, ImapUser, sizeof (account->login));
+    else {
+      mutt_account_getuser (account);
+      strfcpy (account->login, account->user, sizeof (account->login));
+    }

   }
 #endif
 
   }
 #endif