X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=218e29c0c31c566659aa8fe6cb83f765cdc37a5e;hp=96990c2ace36791daf26cb9a86ffce7f78f803e0;hb=fd25c07c1e9e19606b1b6d5533df1f6239455036;hpb=03fe827a7d4a7ad79ac235654414aa339a9a2c9a

diff --git a/init.c b/init.c
index 96990c2..218e29c 100644
--- a/init.c
+++ b/init.c
@@ -24,10 +24,12 @@
 #include <lib-lib/debug.h>
 #include <lib-lib/rx.h>
 
+#include <lib-sys/unix.h>
+
 #include <lib-ui/curses.h>
+#include <lib-ui/history.h>
 
 #include "mutt.h"
-#include "history.h"
 #include "keymap.h"
 #include "mbyte.h"
 #include "charset.h"
@@ -36,7 +38,7 @@
 #include "mutt_idna.h"
 
 #if defined(USE_SSL) || defined(USE_GNUTLS)
-#include <lib-network/mutt_ssl.h>
+#include <lib-sys/mutt_ssl.h>
 #endif
 
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
@@ -2608,7 +2610,8 @@ void mutt_init (int skip_sys_rc, LIST * commands)
     if (!Homedir)
       Homedir = m_strdup(pw->pw_dir);
 
-    Realname = m_strdup(mutt_gecos_name (rnbuf, sizeof(rnbuf), pw));
+    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+    Realname = m_strdup(rnbuf);
     Shell = m_strdup(pw->pw_shell);
     endpwent ();
   }
@@ -2641,7 +2644,7 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   else
     Hostname = m_strdup(utsname.nodename);
 
-  if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
+  if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1)
     Fqdn = m_strdup("@");
   else
   if (*buffer != '@') {