X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=149167cff0bedb9473ec05b6d8f879600062befa;hb=2b44b945cf50e3dbfeabe4e5aee10db4b13f5a64;hp=c0ffabff6398a57572d305d485fb30c2932623ed;hpb=04315f46a16fc3627218377071e008b6b9744992;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index c0ffabff..149167cf 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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 * @@ -52,10 +52,7 @@ Q_IMPORT_PLUGIN(qgif) int main(int argc, char **argv) { - // Setup build information and version string - # include "version.gen" - buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__)); - Quassel::setupBuildInfo(buildinfo); + Quassel::setupBuildInfo(); QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); @@ -98,6 +95,7 @@ int main(int argc, char **argv) cliParser->addOption("qss ", 0, "Load a custom application stylesheet"); cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); + cliParser->addSwitch("hidewindow", 0, "Start the client minimized to the system tray"); #endif #ifndef BUILD_QTUI // put core-only arguments here @@ -114,6 +112,10 @@ int main(int argc, char **argv) cliParser->addOption("change-userpass ", 0, "Starts an interactive session to change the password of the user identified by username"); cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); cliParser->addOption("oidentd-conffile ", 0, "Set path to oidentd configuration file"); +#ifdef HAVE_SSL + cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections"); +#endif + cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif #ifdef HAVE_KDE