projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add oidentd cli options to quasselcore
[quassel.git]
/
src
/
core
/
oidentdconfiggenerator.cpp
diff --git
a/src/core/oidentdconfiggenerator.cpp
b/src/core/oidentdconfiggenerator.cpp
index
2e6e0ca
..
62d31c2
100644
(file)
--- a/
src/core/oidentdconfiggenerator.cpp
+++ b/
src/core/oidentdconfiggenerator.cpp
@@
-32,9
+32,15
@@
OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
bool OidentdConfigGenerator::init() {
configDir = QDir::homePath();
configFileName = ".oidentd.conf";
bool OidentdConfigGenerator::init() {
configDir = QDir::homePath();
configFileName = ".oidentd.conf";
+
+ if(Quassel::isOptionSet("oidentd-conffile"))
+ configPath = Quassel::optionValue("oidentd-conffile");
+ else
+ configPath = configDir.absoluteFilePath(configFileName);
+
configTag = " stanza created by Quassel";
configTag = " stanza created by Quassel";
- _configFile = new QFile(config
Dir.absoluteFilePath(configFileName)
);
+ _configFile = new QFile(config
Path
);
qDebug() << "1: _configFile" << _configFile->fileName();
quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));
qDebug() << "1: _configFile" << _configFile->fileName();
quasselStanza = QRegExp(QString("^lport .* { .* } #%1$").arg(configTag));