lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-15 20:25:47 +02:00
Code Activity

mainapplication: remove gnutls init/deinit

Browse source 
This is moved to libjami in commit e4fa507.
Also bump libjami to e4fa507.

Change-Id: I5414f0b4987aec6474c09d8ecc4d1675c565853d
This commit is contained in:
Andreas Traczyk 2023-01-04 14:42:06 -05:00
parent b67ed463d1
commit ada7c4f06f
4 changed files with 92 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon

@ -1 +1 @@
Subproject commit a204b71769f168f4ece750e0faf369f4b91f7ce2 Subproject commit e4fa5074cac04f7ba5f8e86b4ce371a3af6a0961

8
src/app/mainapplication.cpp
View file

@ -52,10 +52,6 @@
#include "dbuserrorhandler.h" #include "dbuserrorhandler.h"
#endif #endif
#if defined _MSC_VER
#include <gnutls/gnutls.h>
#endif
static QString static QString
getRenderInterfaceString() getRenderInterfaceString()
{ {
@ -140,10 +136,6 @@ MainApplication::init()
settingsManager_->loadTranslations(); settingsManager_->loadTranslations();
setApplicationFont(); setApplicationFont();
#if defined _MSC_VER
gnutls_global_init();
#endif
initLrc(runOptions_[Option::UpdateUrl].toString(), initLrc(runOptions_[Option::UpdateUrl].toString(),
connectivityMonitor_.get(), connectivityMonitor_.get(),
runOptions_[Option::Debug].toBool() && !runOptions_[Option::MuteJamid].toBool()); runOptions_[Option::Debug].toBool() && !runOptions_[Option::MuteJamid].toBool());

44
tests/qml/main.cpp
View file

@ -40,17 +40,17 @@
#include <windows.h> #include <windows.h>
#endif #endif
#if defined _MSC_VER && !COMPILE_ONLY class Setup : public QObject
#include <gnutls/gnutls.h> {
#endif
class Setup : public QObject {
Q_OBJECT Q_OBJECT
public: public:
Setup(bool muteDring = false) : muteDring_(muteDring) {} Setup(bool muteDring = false)
: muteDring_(muteDring)
{}
void init() { void init()
{
connectivityMonitor_.reset(new ConnectivityMonitor(this)); connectivityMonitor_.reset(new ConnectivityMonitor(this));
settingsManager_.reset(new AppSettingsManager(this)); settingsManager_.reset(new AppSettingsManager(this));
systemTray_.reset(new SystemTray(settingsManager_.get(), this)); systemTray_.reset(new SystemTray(settingsManager_.get(), this));
@ -61,20 +61,24 @@ public:
gnutls_global_init(); gnutls_global_init();
#endif #endif
lrcInstance_.reset(new LRCInstance(nullptr, nullptr, "", lrcInstance_.reset(
connectivityMonitor_.get(), muteDring_)); new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), muteDring_));
lrcInstance_->subscribeToDebugReceived(); lrcInstance_->subscribeToDebugReceived();
auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath); auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
lrcInstance_->accountModel().downloadDirectory = lrcInstance_->accountModel().downloadDirectory = downloadPath.toString() + "/";
downloadPath.toString() + "/";
} }
void qmlEngineRegistration(QQmlEngine *engine) { void qmlEngineRegistration(QQmlEngine* engine)
{
// Expose custom types to the QML engine. // Expose custom types to the QML engine.
Utils::registerTypes(engine, systemTray_.get(), lrcInstance_.get(), Utils::registerTypes(engine,
settingsManager_.get(), previewEngine_.get(), systemTray_.get(),
&screenInfo_, this); lrcInstance_.get(),
settingsManager_.get(),
previewEngine_.get(),
&screenInfo_,
this);
} }
public Q_SLOTS: public Q_SLOTS:
@ -94,14 +98,14 @@ public Q_SLOTS:
* This function can be used to register QML types and add import paths, * This function can be used to register QML types and add import paths,
* amongst other things. * amongst other things.
*/ */
void qmlEngineAvailable(QQmlEngine *engine) { void qmlEngineAvailable(QQmlEngine* engine)
{
auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this); auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this);
engine->rootContext()->setContextProperty("videoProvider", videoProvider); engine->rootContext()->setContextProperty("videoProvider", videoProvider);
#ifdef WITH_WEBENGINE #ifdef WITH_WEBENGINE
engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true)); engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true));
#else #else
engine->rootContext()->setContextProperty("WITH_WEBENGINE", engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(false));
QVariant(false));
#endif #endif
qmlEngineRegistration(engine); qmlEngineRegistration(engine);
} }
@ -124,7 +128,9 @@ private:
bool muteDring_ {false}; bool muteDring_ {false};
}; };
int main(int argc, char **argv) { int
main(int argc, char** argv)
{
QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation)); QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami"; auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami";

4
tests/unittests/globaltestenvironment.h
View file

@ -33,10 +33,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
#if defined _MSC_VER && !COMPILE_ONLY
#include <gnutls/gnutls.h>
#endif
class TestEnvironment class TestEnvironment
{ {
public: public: