X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;h=034c5600ec4777476d6ebd4f3f8a986fa4d56bfd;hp=1fe15ceb941869800ba5cde007ef1be3dabdf5e3;hb=e1b19bda89f82f41ed99baa92ac962e48548eae1;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/common/quassel.h b/src/common/quassel.h
index 1fe15ceb..034c5600 100644
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef QUASSEL_H_
@@ -49,10 +49,8 @@ public:
         QString commitHash;
         uint commitDate;
         QString buildDate;
-        bool isSourceDirty;
-        uint protocolVersion;
-        uint clientNeedsProtocol;
-        uint coreNeedsProtocol;
+
+        uint protocolVersion; // deprecated
 
         QString applicationName;
         QString coreApplicationName;
@@ -71,8 +69,10 @@ public:
     enum Feature {
         SynchronizedMarkerLine = 0x0001,
         SaslAuthentication = 0x0002,
+        SaslExternal = 0x0004,
+        HideInactiveNetworks = 0x0008,
 
-        NumFeatures = 0x0002
+        NumFeatures = 0x0008
     };
     Q_DECLARE_FLAGS(Features, Feature);
 
@@ -83,7 +83,7 @@ public:
 
     virtual ~Quassel();
 
-    static void setupBuildInfo(const QString &generated);
+    static void setupBuildInfo();
     static inline const BuildInfo &buildInfo();
     static inline RunMode runMode();
 
@@ -148,6 +148,7 @@ protected:
     inline void disableCrashhandler();
 
 private:
+    void setupEnvironment();
     void registerMetaTypes();
 
     static void handleSignal(int signal);