mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Use Platform::IsWayland from lib_base

Browse Source
This commit is contained in:
Ilya Fedin
2020-06-03 09:43:59 +04:00
committed by John Preston
parent d92b5eebcc
commit d45e74619d
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/platform/linux/linux_libs.cpp
View File

@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/linux/linux_libs.h"
#include "base/platform/base_platform_info.h"
#include "platform/linux/linux_gdk_helper.h"
#include "platform/linux/linux_desktop_environment.h"
#include "platform/linux/specific_linux.h"
@@ -15,8 +16,6 @@ extern "C" {
#include <X11/Xlib.h>
}
#include <QtGui/QGuiApplication>
namespace Platform {
namespace Libs {
namespace {
@@ -144,8 +143,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
// Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
// See https://github.com/telegramdesktop/tdesktop/issues/3176
// See https://github.com/telegramdesktop/tdesktop/issues/3162
if(QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive)
&& !lib_gtk.fileName().contains("gtk-x11-2.0")) {
if(Platform::IsWayland() && !lib_gtk.fileName().contains("gtk-x11-2.0")) {
DEBUG_LOG(("Limit allowed GDK backends to wayland"));
gdk_set_allowed_backends("wayland");
} else {