Get GApplication out of experimental settings

GApplication will always be used on Linux now. GNotification gets a toggle instead.
telegramdesktop · Jan 12, 2023 · a1f9b5a · a1f9b5a
1 parent 2887c0b
commit a1f9b5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #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"