Force parsing of PREFIX in RPL_ISUPPORT. Fixes #936

[quassel.git] / src / common / network.cpp

diff --git a/src/common/network.cpp b/src/common/network.cpp
index b5f9e17..ed8b35a 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -47,6 +47,7 @@ Network::Network(const NetworkId &networkid, QObject *parent)
     _prefixModes(QString()),
     _useRandomServer(false),
     _useAutoIdentify(false),
+    _useSasl(false),
     _useAutoReconnect(false),
     _autoReconnectInterval(60),
     _autoReconnectRetries(10),
@@ -87,6 +88,9 @@ NetworkInfo Network::networkInfo() const {
   info.useAutoIdentify = useAutoIdentify();
   info.autoIdentifyService = autoIdentifyService();
   info.autoIdentifyPassword = autoIdentifyPassword();
+  info.useSasl = useSasl();
+  info.saslAccount = saslAccount();
+  info.saslPassword = saslPassword();
   info.useAutoReconnect = useAutoReconnect();
   info.autoReconnectInterval = autoReconnectInterval();
   info.autoReconnectRetries = autoReconnectRetries();
@@ -108,6 +112,9 @@ void Network::setNetworkInfo(const NetworkInfo &info) {
   if(info.useAutoIdentify != useAutoIdentify()) setUseAutoIdentify(info.useAutoIdentify);
   if(info.autoIdentifyService != autoIdentifyService()) setAutoIdentifyService(info.autoIdentifyService);
   if(info.autoIdentifyPassword != autoIdentifyPassword()) setAutoIdentifyPassword(info.autoIdentifyPassword);
+  if(info.useSasl != useSasl()) setUseSasl(info.useSasl);
+  if(info.saslAccount != saslAccount()) setSaslAccount(info.saslAccount);
+  if(info.saslPassword != saslPassword()) setSaslPassword(info.saslPassword);
   if(info.useAutoReconnect != useAutoReconnect()) setUseAutoReconnect(info.useAutoReconnect);
   if(info.autoReconnectInterval != autoReconnectInterval()) setAutoReconnectInterval(info.autoReconnectInterval);
   if(info.autoReconnectRetries != autoReconnectRetries()) setAutoReconnectRetries(info.autoReconnectRetries);
@@ -187,7 +194,7 @@ QString Network::support(const QString &param) const {
 IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initData) {
   QString nick(nickFromMask(hostmask).toLower());
   if(!_ircUsers.contains(nick)) {
-    IrcUser *ircuser = new IrcUser(hostmask, this);
+    IrcUser *ircuser = ircUserFactory(hostmask);
     if(!initData.isEmpty()) {
       ircuser->fromVariantMap(initData);
       ircuser->setInitialized();
@@ -336,6 +343,7 @@ void Network::setCodecForServer(QTextCodec *codec) {
   _codecForServer = codec;
   QByteArray codecName = codecForServer();
   SYNC_OTHER(setCodecForServer, ARG(codecName))
+  emit configChanged();
 }
 
 QByteArray Network::codecForEncoding() const {
@@ -352,6 +360,7 @@ void Network::setCodecForEncoding(QTextCodec *codec) {
   _codecForEncoding = codec;
   QByteArray codecName = codecForEncoding();
   SYNC_OTHER(setCodecForEncoding, ARG(codecName))
+  emit configChanged();
 }
 
 QByteArray Network::codecForDecoding() const {
@@ -368,6 +377,7 @@ void Network::setCodecForDecoding(QTextCodec *codec) {
   _codecForDecoding = codec;
   QByteArray codecName = codecForDecoding();
   SYNC_OTHER(setCodecForDecoding, ARG(codecName))
+  emit configChanged();
 }
 
 // FIXME use server encoding if appropriate
@@ -465,7 +475,6 @@ NetworkInfo Network::networkInfoFromPreset(const QString &networkName) {
   return info;
 }
 
-
 // ====================
 //  Public Slots:
 // ====================
@@ -473,6 +482,7 @@ void Network::setNetworkName(const QString &networkName) {
   _networkName = networkName;
   SYNC(ARG(networkName))
   emit networkNameSet(networkName);
+  emit configChanged();
 }
 
 void Network::setCurrentServer(const QString &currentServer) {
@@ -523,61 +533,91 @@ void Network::setIdentity(IdentityId id) {
   _identity = id;
   SYNC(ARG(id))
   emit identitySet(id);
+  emit configChanged();
 }
 
 void Network::setServerList(const QVariantList &serverList) {
   _serverList = fromVariantList<Server>(serverList);
   SYNC(ARG(serverList))
+  emit configChanged();
 }
 
 void Network::setUseRandomServer(bool use) {
   _useRandomServer = use;
   SYNC(ARG(use))
+  emit configChanged();
 }
 
 void Network::setPerform(const QStringList &perform) {
   _perform = perform;
   SYNC(ARG(perform))
+  emit configChanged();
 }
 
 void Network::setUseAutoIdentify(bool use) {
   _useAutoIdentify = use;
   SYNC(ARG(use))
+  emit configChanged();
 }
 
 void Network::setAutoIdentifyService(const QString &service) {
   _autoIdentifyService = service;
   SYNC(ARG(service))
+  emit configChanged();
 }
 
 void Network::setAutoIdentifyPassword(const QString &password) {
   _autoIdentifyPassword = password;
   SYNC(ARG(password))
+  emit configChanged();
+}
+
+void Network::setUseSasl(bool use) {
+  _useSasl = use;
+  SYNC(ARG(use))
+  emit configChanged();
+}
+
+void Network::setSaslAccount(const QString &account) {
+  _saslAccount = account;
+  SYNC(ARG(account))
+  emit configChanged();
+}
+
+void Network::setSaslPassword(const QString &password) {
+  _saslPassword = password;
+  SYNC(ARG(password))
+  emit configChanged();
 }
 
 void Network::setUseAutoReconnect(bool use) {
   _useAutoReconnect = use;
   SYNC(ARG(use))
+  emit configChanged();
 }
 
 void Network::setAutoReconnectInterval(quint32 interval) {
   _autoReconnectInterval = interval;
   SYNC(ARG(interval))
+  emit configChanged();
 }
 
 void Network::setAutoReconnectRetries(quint16 retries) {
   _autoReconnectRetries = retries;
   SYNC(ARG(retries))
+  emit configChanged();
 }
 
 void Network::setUnlimitedReconnectRetries(bool unlimited) {
   _unlimitedReconnectRetries = unlimited;
   SYNC(ARG(unlimited))
+  emit configChanged();
 }
 
 void Network::setRejoinChannels(bool rejoin) {
   _rejoinChannels = rejoin;
   SYNC(ARG(rejoin))
+  emit configChanged();
 }
 
 void Network::addSupport(const QString &param, const QString &value) {
@@ -708,12 +748,15 @@ void Network::determinePrefixes() {
       _prefixModes = defaultPrefixModes;
       return;
     }
+    // clear the existing modes, just in case we're run multiple times
+    _prefixes = QString();
+    _prefixModes = QString();
 
     // we just assume that in PREFIX are only prefix chars stored
     for(int i = 0; i < defaultPrefixes.size(); i++) {
       if(prefix.contains(defaultPrefixes[i])) {
-       _prefixes += defaultPrefixes[i];
-       _prefixModes += defaultPrefixModes[i];
+        _prefixes += defaultPrefixes[i];
+        _prefixModes += defaultPrefixModes[i];
       }
     }
     // check for success
@@ -724,8 +767,8 @@ void Network::determinePrefixes() {
     // check if it's only prefix modes
     for(int i = 0; i < defaultPrefixes.size(); i++) {
       if(prefix.contains(defaultPrefixModes[i])) {
-       _prefixes += defaultPrefixes[i];
-       _prefixModes += defaultPrefixModes[i];
+        _prefixes += defaultPrefixes[i];
+        _prefixModes += defaultPrefixModes[i];
       }
     }
     // now we've done all we've could...
@@ -742,6 +785,7 @@ NetworkInfo::NetworkInfo()
   useRandomServer(false),
   useAutoIdentify(false),
   autoIdentifyService("NickServ"),
+  useSasl(false),
   useAutoReconnect(true),
   autoReconnectInterval(60),
   autoReconnectRetries(20),
@@ -764,6 +808,9 @@ bool NetworkInfo::operator==(const NetworkInfo &other) const {
   if(useAutoIdentify != other.useAutoIdentify) return false;
   if(autoIdentifyService != other.autoIdentifyService) return false;
   if(autoIdentifyPassword != other.autoIdentifyPassword) return false;
+  if(useSasl != other.useSasl) return false;
+  if(saslAccount != other.saslAccount) return false;
+  if(saslPassword != other.saslPassword) return false;
   if(useAutoReconnect != other.useAutoReconnect) return false;
   if(autoReconnectInterval != other.autoReconnectInterval) return false;
   if(autoReconnectRetries != other.autoReconnectRetries) return false;
@@ -790,6 +837,9 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) {
   i["UseAutoIdentify"] = info.useAutoIdentify;
   i["AutoIdentifyService"] = info.autoIdentifyService;
   i["AutoIdentifyPassword"] = info.autoIdentifyPassword;
+  i["UseSasl"] = info.useSasl;
+  i["SaslAccount"] = info.saslAccount;
+  i["SaslPassword"] = info.saslPassword;
   i["UseAutoReconnect"] = info.useAutoReconnect;
   i["AutoReconnectInterval"] = info.autoReconnectInterval;
   i["AutoReconnectRetries"] = info.autoReconnectRetries;
@@ -814,6 +864,9 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) {
   info.useAutoIdentify = i["UseAutoIdentify"].toBool();
   info.autoIdentifyService = i["AutoIdentifyService"].toString();
   info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString();
+  info.useSasl = i["UseSasl"].toBool();
+  info.saslAccount = i["SaslAccount"].toString();
+  info.saslPassword = i["SaslPassword"].toString();
   info.useAutoReconnect = i["UseAutoReconnect"].toBool();
   info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt();
   info.autoReconnectRetries = i["AutoReconnectRetries"].toInt();
@@ -824,12 +877,13 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) {
 
 QDebug operator<<(QDebug dbg, const NetworkInfo &i) {
   dbg.nospace() << "(id = " << i.networkId << " name = " << i.networkName << " identity = " << i.identity
-               << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding
-               << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform
-               << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword
-               << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval
-               << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries
-               << " rejoinChannels = " << i.rejoinChannels << ")";
+                << " codecForServer = " << i.codecForServer << " codecForEncoding = " << i.codecForEncoding << " codecForDecoding = " << i.codecForDecoding
+                << " serverList = " << i.serverList << " useRandomServer = " << i.useRandomServer << " perform = " << i.perform
+                << " useAutoIdentify = " << i.useAutoIdentify << " autoIdentifyService = " << i.autoIdentifyService << " autoIdentifyPassword = " << i.autoIdentifyPassword
+                << " useSasl = " << i.useSasl << " saslAccount = " << i.saslAccount << " saslPassword = " << i.saslPassword
+                << " useAutoReconnect = " << i.useAutoReconnect << " autoReconnectInterval = " << i.autoReconnectInterval
+                << " autoReconnectRetries = " << i.autoReconnectRetries << " unlimitedReconnectRetries = " << i.unlimitedReconnectRetries
+                << " rejoinChannels = " << i.rejoinChannels << ")";
   return dbg.space();
 }