From a3caecbc07585ea9893df46a416ad25c59317404 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 7 Dec 2022 01:27:36 +0400 Subject: [PATCH] Fix build with clang --- .../platform/linux/notifications_manager_linux.cpp | 8 +++++--- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 3 ++- Telegram/lib_base | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index 92fe1df738..93c6aaf1de 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -80,7 +80,8 @@ std::unique_ptr CreateServiceWatcher() { try { return ranges::contains( base::Platform::DBus::ListActivatableNames(connection), - Glib::ustring(std::string(kService))); + std::string(kService), + &Glib::ustring::raw); } catch (...) { // avoid service restart loop in sandboxed environments return true; @@ -129,7 +130,7 @@ void StartServiceAsync(Fn callback) { }; const auto errorName = - Gio::DBus::ErrorUtils::get_remote_error(e); + Gio::DBus::ErrorUtils::get_remote_error(e).raw(); if (!ranges::contains(NotSupportedErrors, errorName)) { throw e; @@ -166,7 +167,8 @@ bool GetServiceRegistered() { try { return ranges::contains( DBus::ListActivatableNames(connection), - Glib::ustring(std::string(kService))); + std::string(kService), + &Glib::ustring::raw); } catch (...) { return false; } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index b1f1f8884c..1638e83c7e 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -264,7 +264,8 @@ void LaunchGApplication() { if (ranges::contains( activatableNames, - "org.freedesktop.Notifications")) { + "org.freedesktop.Notifications", + &Glib::ustring::raw)) { return true; } diff --git a/Telegram/lib_base b/Telegram/lib_base index 1df4417b0c..fb9000a353 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 1df4417b0c9a74f340afc5737b26bbbd06aca246 +Subproject commit fb9000a35334bbe30c1f9e5dcf890fa517715a02