diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-01-12 21:06:32 +0400 |
|---|---|---|
| committer | John Preston <johnprestonmail@gmail.com> | 2023-01-12 21:49:16 +0400 |
| commit | a1f9b5a96ff5394f3283e15ab659d10803dd0b98 (patch) | |
| tree | 17db61dad620e1a617245864eacfa396a7e159be | |
| parent | 2887c0b5643e8cc0d1c689e7191cdc12b994a439 (diff) | |
Get GApplication out of experimental settingsv4.5.6
GApplication will always be used on Linux now. GNotification gets a toggle instead.
3 files changed, 5 insertions, 2 deletions
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index 53b47b1859..1bc1e3156c 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -389,7 +389,9 @@ NotificationData::NotificationData( NotificationId id) : _manager(manager) , _id(id) -, _application(UseGNotification() ? Gio::Application::get_default() : {}) { +, _application(UseGNotification() + ? Gio::Application::get_default() + : nullptr) { } bool NotificationData::init( diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp index 2092600596..61163ac901 100644 --- a/Telegram/SourceFiles/settings/settings_experimental.cpp +++ b/Telegram/SourceFiles/settings/settings_experimental.cpp @@ -148,7 +148,7 @@ void SetupExperimental( addToggle(Settings::kOptionMonoSettingsIcons); addToggle(Webview::kOptionWebviewDebugEnabled); addToggle(kOptionAutoScrollInactiveChat); - addToggle(Windows::Notifications::kOptionGNotification); + addToggle(Window::Notifications::kOptionGNotification); } } // namespace diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index 665b2d7546..7960d86087 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "window/notifications_manager.h" +#include "base/options.h" #include "platform/platform_notifications_manager.h" #include "window/notifications_manager_default.h" #include "media/audio/media_audio_track.h" |