projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Fix SQLite realname/avatarurl handling
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
3c12327
..
25dd685
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-55,6
+55,12
@@
bool CoreApplicationInternal::init()
Core::instance(); // create and init the core
_coreCreated = true;
Core::instance(); // create and init the core
_coreCreated = true;
+ Quassel::registerReloadHandler([]() {
+ // Currently, only reloading SSL certificates and the sysident cache is supported
+ Core::cacheSysIdent();
+ return Core::reloadCerts();
+ });
+
if (!Quassel::isOptionSet("norestore"))
Core::restoreState();
if (!Quassel::isOptionSet("norestore"))
Core::restoreState();
@@
-65,13
+71,13
@@
bool CoreApplicationInternal::init()
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
- : QCoreApplication(argc, argv)
, Quassel()
+ : QCoreApplication(argc, argv)
{
#ifdef Q_OS_MAC
{
#ifdef Q_OS_MAC
-
disableCrashh
andler();
+
Quassel::disableCrashH
andler();
#endif /* Q_OS_MAC */
#endif /* Q_OS_MAC */
- setRunMode(Quassel::CoreOnly);
+
Quassel::
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
}
_internal = new CoreApplicationInternal();
}
@@
-79,13
+85,18
@@
CoreApplication::CoreApplication(int &argc, char **argv)
CoreApplication::~CoreApplication()
{
delete _internal;
CoreApplication::~CoreApplication()
{
delete _internal;
+ Quassel::destroy();
}
bool CoreApplication::init()
{
if (Quassel::init() && _internal->init()) {
}
bool CoreApplication::init()
{
if (Quassel::init() && _internal->init()) {
+#if QT_VERSION < 0x050000
qInstallMsgHandler(Logger::logMessage);
qInstallMsgHandler(Logger::logMessage);
+#else
+ qInstallMessageHandler(Logger::logMessage);
+#endif
return true;
}
return false;
return true;
}
return false;