Fix build with clang

This commit is contained in:
Ilya Fedin 2022-12-07 01:27:36 +04:00 committed by John Preston
parent 71354d1611
commit a3caecbc07
3 changed files with 8 additions and 5 deletions

View file

@ -80,7 +80,8 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
try { try {
return ranges::contains( return ranges::contains(
base::Platform::DBus::ListActivatableNames(connection), base::Platform::DBus::ListActivatableNames(connection),
Glib::ustring(std::string(kService))); std::string(kService),
&Glib::ustring::raw);
} catch (...) { } catch (...) {
// avoid service restart loop in sandboxed environments // avoid service restart loop in sandboxed environments
return true; return true;
@ -129,7 +130,7 @@ void StartServiceAsync(Fn<void()> callback) {
}; };
const auto errorName = const auto errorName =
Gio::DBus::ErrorUtils::get_remote_error(e); Gio::DBus::ErrorUtils::get_remote_error(e).raw();
if (!ranges::contains(NotSupportedErrors, errorName)) { if (!ranges::contains(NotSupportedErrors, errorName)) {
throw e; throw e;
@ -166,7 +167,8 @@ bool GetServiceRegistered() {
try { try {
return ranges::contains( return ranges::contains(
DBus::ListActivatableNames(connection), DBus::ListActivatableNames(connection),
Glib::ustring(std::string(kService))); std::string(kService),
&Glib::ustring::raw);
} catch (...) { } catch (...) {
return false; return false;
} }

View file

@ -264,7 +264,8 @@ void LaunchGApplication() {
if (ranges::contains( if (ranges::contains(
activatableNames, activatableNames,
"org.freedesktop.Notifications")) { "org.freedesktop.Notifications",
&Glib::ustring::raw)) {
return true; return true;
} }

@ -1 +1 @@
Subproject commit 1df4417b0c9a74f340afc5737b26bbbd06aca246 Subproject commit fb9000a35334bbe30c1f9e5dcf890fa517715a02