X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=1978ebe98ec0f3c4b84092937dc7a4800f5800c3;hp=a11b9f00010d914f1b97d3e2f8da04aa95985a1b;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hpb=c6a9c963d53a171394b5c25d9925661e2788cec3

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index a11b9f00..1978ebe9 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -88,7 +88,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;
 
@@ -144,8 +147,7 @@ QString Identity::defaultRealName() {
 void Identity::setToDefaults() {
   setIdentityName(tr("<empty>"));
   setRealName(defaultRealName());
-  QString defNick = defaultNick();
-  QStringList n = QStringList() << defNick << defNick + "_" << defNick + "__";
+  QStringList n = QStringList() << defaultNick();
   setNicks(n);
   setAwayNick("");
   setAwayNickEnabled(false);