projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reject clients that attempt to login before the core is configured
[quassel.git]
/
src
/
common
/
logger.cpp
diff --git
a/src/common/logger.cpp
b/src/common/logger.cpp
index
7cb7f4a
..
5462355
100644
(file)
--- a/
src/common/logger.cpp
+++ b/
src/common/logger.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-77,7
+77,7
@@
void Logger::log()
prio = LOG_INFO;
break;
}
prio = LOG_INFO;
break;
}
- syslog(
LOG_USER & prio
, "%s", qPrintable(_buffer));
+ syslog(
prio|LOG_USER
, "%s", qPrintable(_buffer));
}
#endif
}
#endif
@@
-125,6
+125,11
@@
void Logger::logMessage(QtMsgType type, const QMessageLogContext &context, const
case QtDebugMsg:
Logger(Quassel::DebugLevel) << msg.toLocal8Bit().constData();
break;
case QtDebugMsg:
Logger(Quassel::DebugLevel) << msg.toLocal8Bit().constData();
break;
+#if QT_VERSION >= 0x050500
+ case QtInfoMsg:
+ Logger(Quassel::InfoLevel) << msg.toLocal8Bit().constData();
+ break;
+#endif
case QtWarningMsg:
Logger(Quassel::WarningLevel) << msg.toLocal8Bit().constData();
break;
case QtWarningMsg:
Logger(Quassel::WarningLevel) << msg.toLocal8Bit().constData();
break;