no longer adding nick alternatives with trailing underscores to the default nicks

[quassel.git] / src / common / identity.cpp

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index 40b0b2b..2652098 100644 (file)
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -28,6 +28,12 @@
 #  include "mac_utils.h"
 #endif
 
+#ifdef Q_OS_UNIX
+#  include <sys/types.h>
+#  include <pwd.h>
+#  include <unistd.h>
+#endif
+
 #ifdef Q_OS_WIN32
 #  include <windows.h>
 #  include <Winbase.h>
@@ -75,10 +81,17 @@ void Identity::init() {
 
 QString Identity::defaultNick() {
   QString nick = QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
+
 #ifdef Q_OS_MAC
   QString shortUserName = CFStringToQString(CSCopyUserName(true));
   if(!shortUserName.isEmpty())
     nick = shortUserName;
+
+#elif defined(Q_OS_UNIX)
+  QString userName = getlogin();
+  if(!userName.isEmpty())
+    nick = userName;
+
 #elif defined(Q_OS_WIN32)
   TCHAR  infoBuf[128];
   DWORD  bufCharCount = 128;
@@ -93,16 +106,29 @@ QString Identity::defaultNick() {
       nick = nickName;
   }
 #endif
+
   // cleaning forbidden characters from nick
-  QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
+  QRegExp rx(QString("(^[\\d-]+|[^A-Za-z0-9\x5b-\x60\x7b-\x7d])"));
   nick.remove(rx);
   return nick;
 }
 
 QString Identity::defaultRealName() {
   QString generalDefault = tr("Quassel IRC User");
+
 #ifdef Q_OS_MAC
   return CFStringToQString(CSCopyUserName(false));
+
+#elif defined(Q_OS_UNIX)
+  QString realName;
+  struct passwd *pwd = getpwuid(getuid());
+  if(pwd)
+    realName = pwd->pw_gecos;
+  if(!realName.isEmpty())
+    return realName;
+  else
+    return generalDefault;
+
 #elif defined(Q_OS_WIN32)
   TCHAR  infoBuf[128];
   DWORD  bufCharCount = 128;
@@ -118,8 +144,7 @@ QString Identity::defaultRealName() {
 void Identity::setToDefaults() {
   setIdentityName(tr("<empty>"));
   setRealName(defaultRealName());
-  QStringList n;
-  n << defaultNick();
+  QStringList n = QStringList() << defaultNick();
   setNicks(n);
   setAwayNick("");
   setAwayNickEnabled(false);