X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.h;h=dd413e0d73608775a760f48920135555c031bbe8;hp=b14f009efab52c2b52f60ec46cebdff6cb9fb844;hb=695758015a80eb8c158a9ac4c0f1c0b547e70df3;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h index b14f009e..dd413e0d 100644 --- a/src/client/clientsettings.h +++ b/src/client/clientsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2015 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 CLIENTSETTINGS_H @@ -124,7 +124,7 @@ class CoreConnectionSettings : public ClientSettings { public: enum NetworkDetectionMode { - UseSolid, + UseQNetworkConfigurationManager = 1, // UseSolid is gone UsePingTimeout, NoActiveDetection };