projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b7f0f6
)
Use login name as default nick on Unix, fixes #516
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 11 Feb 2009 21:14:31 +0000
(22:14 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 11 Feb 2009 21:23:04 +0000
(22:23 +0100)
src/common/identity.cpp
patch
|
blob
|
history
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
40b0b2b
..
b8afedf
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-28,6
+28,12
@@
# include "mac_utils.h"
#endif
# 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>
#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
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;
#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;
#elif defined(Q_OS_WIN32)
TCHAR infoBuf[128];
DWORD bufCharCount = 128;
@@
-93,6
+106,7
@@
QString Identity::defaultNick() {
nick = nickName;
}
#endif
nick = nickName;
}
#endif
+
// cleaning forbidden characters from nick
QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
nick.remove(rx);
// cleaning forbidden characters from nick
QRegExp rx(QString("(^[\\d-]+|[^A-Za-z\x5b-\x60\x7b-\x7d])"));
nick.remove(rx);
@@
-119,7
+133,7
@@
void Identity::setToDefaults() {
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
QStringList n;
setIdentityName(tr("<empty>"));
setRealName(defaultRealName());
QStringList n;
- n << defaultNick();
+ n << defaultNick()
<< defaultNick() + "_" << defaultNick() + "__"
;
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);
setNicks(n);
setAwayNick("");
setAwayNickEnabled(false);