fixed a major bug introduced in r456 (segfault on core exit)

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

diff --git a/src/common/network.h b/src/common/network.h
index 25b02bc..d44319c 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -164,7 +164,6 @@ public slots:
   void emitConnectionError(const QString &);
 
 private slots:
-  void ircUserDestroyed();
   void channelDestroyed();
   void removeIrcUser(IrcUser *ircuser);
   void ircUserInitDone();
@@ -239,9 +238,25 @@ struct NetworkInfo {
   NetworkId networkId;
   QString networkName;
   IdentityId identity;
+
+  bool useCustomEncodings;
   QByteArray codecForEncoding;
   QByteArray codecForDecoding;
+
+  // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL"
   QVariantList serverList;
+  bool useRandomServer;
+
+  QStringList perform;
+
+  bool useAutoIdentify;
+  QString autoIdentifyService;
+  QString autoIdentifyPassword;
+
+  bool useAutoReconnect;
+  quint32 autoReconnectInterval;
+  qint16 autoReconnectRetries;  // -1 => Unlimited
+  bool rejoinChannels;
 
   bool operator==(const NetworkInfo &other) const;
   bool operator!=(const NetworkInfo &other) const;