Now that exceptions are allowed, handle gracefully the case where a Buffer temp direc...

[lyx.git] / src / support / userinfo.cpp

diff --git a/src/support/userinfo.cpp b/src/support/userinfo.cpp
index a82c9592e5195066d9b1cd2e4d8578d2a2a3978c..ca4e0e948077be62c8dba20631e24ac14dc682b1 100644 (file)
--- a/src/support/userinfo.cpp
+++ b/src/support/userinfo.cpp
@@ -12,11 +12,12 @@
 
 #include "support/userinfo.h"
 #include "support/environment.h"
+#include "support/docstring.h"
 
 #include <boost/assert.hpp>
 
 #if defined (_WIN32)
-# include "gettext.h"
+# include "support/gettext.h"
 # include <windows.h>
 # include <lmcons.h>
 #else
@@ -29,18 +30,13 @@
 # include <sys/types.h>
 #endif
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace support {
 
 docstring const user_name()
 {
-       //FIXME: quick fix wrt bug #3764; only Anonymous is detected now.
-       //The code after should be used only after user approval.
-       return from_ascii("Anonymous");
-       
-       
 #if defined (_WIN32)
 
        char name[UNLEN + 1];
@@ -49,7 +45,7 @@ docstring const user_name()
                return _("Unknown user");
        return from_local8bit(name);
 #else
-       struct passwd * pw(getpwuid(geteuid()));
+       struct passwd * pw = getpwuid(geteuid());
        BOOST_ASSERT(pw);
 
        string name = pw->pw_gecos;