projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: Remove unused and broken scopeMatch()
[quassel.git]
/
src
/
common
/
presetnetworks.cpp
diff --git
a/src/common/presetnetworks.cpp
b/src/common/presetnetworks.cpp
index
d4a582f
..
9f8b31d
100644
(file)
--- a/
src/common/presetnetworks.cpp
+++ b/
src/common/presetnetworks.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
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 *
@@
-86,7
+86,8
@@
NetworkInfo PresetNetworks::networkInfo(const QString &networkName)
qWarning() << "Invalid port entry in networks.conf:" << server;
continue;
}
qWarning() << "Invalid port entry in networks.conf:" << server;
continue;
}
- info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl);
+ // TODO Should networks.conf be modified to allow requiring SSL?
+ info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl, false);
}
}
return info;
}
}
return info;