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

Simplify XErrorHandlerRestorer API

Browse Source
This commit is contained in:
Ilya Fedin
2020-12-10 06:32:30 +04:00
committed by John Preston
parent 3297bdadb5
commit 05147016b0
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_domain.h"
#include "mainwindow.h"
using Platform::internal::XErrorHandlerRestorer;
namespace Platform {
namespace Libs {
namespace {
@@ -123,8 +125,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
// gtk_init will reset the Xlib error handler, and that causes
// Qt applications to quit on X errors. Therefore, we need to manually restore it.
internal::XErrorHandlerRestorer handlerRestorer;
handlerRestorer.save();
XErrorHandlerRestorer handlerRestorer;
DEBUG_LOG(("Library gtk functions loaded!"));
gtkTriedToInit = true;
@@ -135,8 +136,6 @@ bool setupGtkBase(QLibrary &lib_gtk) {
}
DEBUG_LOG(("Checked gtk with gtk_init_check!"));
handlerRestorer.restore();
// Use our custom log handler.
g_log_set_handler("Gtk", G_LOG_LEVEL_MESSAGE, gtkMessageHandler, nullptr);