projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Categories in the settings dialog are now clickable
[quassel.git]
/
src
/
common
/
identity.cpp
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
b8afedf
..
1978ebe
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-88,7
+88,10
@@
QString Identity::defaultNick() {
nick = shortUserName;
#elif defined(Q_OS_UNIX)
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;
if(!userName.isEmpty())
nick = userName;
@@
-108,15
+111,27
@@
QString Identity::defaultNick() {
#endif
// cleaning forbidden characters from nick
#endif
// cleaning forbidden characters from nick
- QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
+ QRegExp rx(QString("(^[\\d-]+|[^A-Za-z
0-9
\x5b-\x60\x7b-\x7d])"));
nick.remove(rx);
return nick;
}
QString Identity::defaultRealName() {
QString generalDefault = tr("Quassel IRC User");
nick.remove(rx);
return nick;
}
QString Identity::defaultRealName() {
QString generalDefault = tr("Quassel IRC User");
+
#ifdef Q_OS_MAC
return CFStringToQString(CSCopyUserName(false));
#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;
#elif defined(Q_OS_WIN32)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
@@
-132,8
+147,7
@@
QString Identity::defaultRealName() {
void Identity::setToDefaults() {
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
void Identity::setToDefaults() {
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
- QStringList n;
- n << defaultNick() << defaultNick() + "_" << defaultNick() + "__";
+ QStringList n = QStringList() << defaultNick();
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);