RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move GTK initialization before Qt initialization 

To ensure Qt doesn't load GTK earlier than us and gdk_set_allowed_backends respected
This commit is contained in:
Ilya Fedin 2021-04-13 02:51:52 +04:00 committed by John Preston
parent 73c63cb2c7
commit c87802ce65
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -747,8 +747,13 @@ void start() {
if (const auto integration = BaseGtkIntegration::Instance()) {
integration->prepareEnvironment();
integration->load();
} else {
g_warning("GTK integration is disabled, some feature unavailable.");
g_warning("GTK integration is disabled, some features unavailable.");
}
if (const auto integration = GtkIntegration::Instance()) {
integration->load();
}
#ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE
@ -947,11 +952,7 @@ namespace ThirdParty {
void start() {
if (const auto integration = BaseGtkIntegration::Instance()) {
integration->load();
}
if (const auto integration = GtkIntegration::Instance()) {
integration->load();
integration->initializeSettings();
}
SetGtkScaleFactor();

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 32b7db64c5ec44dadd95a4024dfd1e8c8d23fa12
Subproject commit 40eafc24d1fba3d4652d6a262797d50a0b91f7f8