X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=0569178ade8b86b0fbc150c2cbe322d3d64ecb1b;hp=26520989e49f1fa0a45fc4b3c45a21d9991b51ea;hb=9f461bad6c890d3fe92d89ebf1b6a3f313d7e8ef;hpb=35592161284b2196444936f6ecd3dcb8d47b1b54

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index 26520989..0569178a 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -22,6 +22,7 @@
 
 #include <QMetaProperty>
 #include <QVariantMap>
+#include <QString>
 
 #ifdef Q_OS_MAC
 #  include <CoreServices/CoreServices.h>
@@ -88,7 +89,10 @@ QString Identity::defaultNick() {
     nick = shortUserName;
 
 #elif defined(Q_OS_UNIX)
-  QString userName = getlogin();
+  QString userName;
+  struct passwd *pwd = getpwuid(getuid());
+  if(pwd)
+    userName = pwd->pw_name;
   if(!userName.isEmpty())
     nick = userName;
 
@@ -123,7 +127,7 @@ QString Identity::defaultRealName() {
   QString realName;
   struct passwd *pwd = getpwuid(getuid());
   if(pwd)
-    realName = pwd->pw_gecos;
+    realName = QString::fromUtf8(pwd->pw_gecos);
   if(!realName.isEmpty())
     return realName;
   else