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

GApplication as GNotification option scope

This commit is contained in:
Ilya Fedin 2023-03-04 11:26:38 +04:00 committed by John Preston
parent ccbab25fae
commit 40b79dec12
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@ -40,6 +40,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow>
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
#include <giomm.h>
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
namespace Window {
namespace Notifications {
namespace {
@ -85,7 +89,13 @@ base::options::toggle OptionGNotification({
.name = "GNotification",
.description = "Force enable GLib's GNotification."
" When disabled, autodetect is used.",
.scope = base::options::linux,
.scope = [] {
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
return bool(Gio::Application::get_default());
#else // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
return false;
#endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
},
.restartRequired = true,
});

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 723df5d5109bd5c07f30e05f0b0a0520643ef41b
Subproject commit 7f129171548a3828693d7f79fbdb783464f31b97