X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=03482c61f4dee12cd12f263de46d6301a9e04c56;hp=5eab9db5043539e621e2f81ee326fb177c6e5802;hb=0dc3054df348d3c9788ecf6aba028668c684a7bc;hpb=23976263ea635d42933503805f9eca006ae24daf

diff --git a/alias.c b/alias.c
index 5eab9db..03482c6 100644
--- a/alias.c
+++ b/alias.c
@@ -107,10 +107,10 @@ int mutt_addr_is_user(address_t *addr)
     if (!addr->mailbox)
         return 0;
 
-    if (!ascii_strcasecmp(addr->mailbox, Username)
-    ||  string_is_address(addr->mailbox, Username, Hostname)
-    ||  string_is_address(addr->mailbox, Username, mutt_fqdn(0))
-    ||  string_is_address(addr->mailbox, Username, mutt_fqdn(1))
+    if (!ascii_strcasecmp(addr->mailbox, MCore.username)
+    ||  string_is_address(addr->mailbox, MCore.username, Hostname)
+    ||  string_is_address(addr->mailbox, MCore.username, mutt_fqdn(0))
+    ||  string_is_address(addr->mailbox, MCore.username, mutt_fqdn(1))
     ||  (From && !ascii_strcasecmp(From->mailbox, addr->mailbox)))
     {
         return 1;
@@ -287,7 +287,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr)
         return;
     }
 
-    mutt_expand_path(buf, sizeof (buf));
+    mutt_expand_path(buf, sizeof(buf));
     rc = safe_fopen (buf, "a");
 
     if (rc) {