Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 1c0f7ecac0da (bug 1859865) for causing bustages at MPRISServiceHandler.cpp.

Browse Source
This commit is contained in:
Butkovits Atila 2023-11-04 01:59:29 +02:00
parent 516b835e45
commit bf6ab69197
4 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hal/linux/UPowerClient.cpp
View File

@ -167,13 +167,9 @@ void UPowerClient::BeginListening() {
UpdateTrackedDevices(); UpdateTrackedDevices();
}, },
[](GUniquePtr<GError>&& aError) { [](GUniquePtr<GError>&& aError) {
if (!g_error_matches(aError.get(), G_IO_ERROR, g_warning(
G_IO_ERROR_CANCELLED)) { "Failed to create DBus proxy for org.freedesktop.UPower: %s\n",
g_warning( aError->message);
"Failed to create DBus proxy for org.freedesktop.UPower: "
"%s\n",
aError->message);
}
}); });
} }
@ -279,12 +275,9 @@ void UPowerClient::UpdateTrackedDevices() {
G_CALLBACK(DeviceChanged), this); G_CALLBACK(DeviceChanged), this);
}, },
[this](GUniquePtr<GError>&& aError) { [this](GUniquePtr<GError>&& aError) {
if (!g_error_matches(aError.get(), G_IO_ERROR, g_warning(
G_IO_ERROR_CANCELLED)) { "Failed to enumerate devices of org.freedesktop.UPower: %s\n",
g_warning( aError->message);
"Failed to enumerate devices of org.freedesktop.UPower: %s\n",
aError->message);
}
g_signal_connect(mUPowerProxy, "g-signal", g_signal_connect(mUPowerProxy, "g-signal",
G_CALLBACK(DeviceChanged), this); G_CALLBACK(DeviceChanged), this);
}); });

8
widget/gtk/MPRISServiceHandler.cpp
View File

@ -318,11 +318,9 @@ void g_bus_get_callback(GObject* aSourceObject, GAsyncResult* aRes,
GDBusConnection* conn = g_bus_get_finish(aRes, getter_Transfers(error)); GDBusConnection* conn = g_bus_get_finish(aRes, getter_Transfers(error));
if (!conn) { if (!conn) {
if (!IsCancelledGError(error.get())) { NS_WARNING(nsPrintfCString("Failure at g_bus_get_finish: %s",
NS_WARNING(nsPrintfCString("Failure at g_bus_get_finish: %s", error ? error->message : "Unknown Error")
error ? error->message : "Unknown Error") .get());
.get());
}
return; return;
} }

2
widget/gtk/nsAppShell.cpp
View File

@ -220,7 +220,7 @@ void nsAppShell::DBusConnectClientResponse(GObject* aObject,
RefPtr<GDBusProxy> proxyClient = RefPtr<GDBusProxy> proxyClient =
dont_AddRef(g_dbus_proxy_new_finish(aResult, getter_Transfers(error))); dont_AddRef(g_dbus_proxy_new_finish(aResult, getter_Transfers(error)));
if (!proxyClient) { if (!proxyClient) {
if (!IsCancelledGError(error.get())) { if (!g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
NS_WARNING( NS_WARNING(
nsPrintfCString("Failed to connect to client: %s\n", error->message) nsPrintfCString("Failed to connect to client: %s\n", error->message)
.get()); .get());

12
widget/gtk/nsUserIdleServiceGTK.cpp
View File

@ -196,11 +196,9 @@ class UserIdleServiceMutter : public UserIdleServiceImpl {
}, },
[this](GUniquePtr<GError>&& aError) { [this](GUniquePtr<GError>&& aError) {
mPollInProgress = false; mPollInProgress = false;
if (!IsCancelledGError(aError.get())) { g_warning("Failed to call GetIdletime(): %s\n",
g_warning("Failed to call GetIdletime(): %s\n", aError->message);
aError->message); mUserIdleServiceGTK->RejectAndTryNextServiceCallback();
mUserIdleServiceGTK->RejectAndTryNextServiceCallback();
}
}); });
} }
@ -229,9 +227,7 @@ class UserIdleServiceMutter : public UserIdleServiceImpl {
mUserIdleServiceGTK->AcceptServiceCallback(); mUserIdleServiceGTK->AcceptServiceCallback();
}, },
[this](GUniquePtr<GError>&& aError) { [this](GUniquePtr<GError>&& aError) {
if (!IsCancelledGError(aError.get())) { mUserIdleServiceGTK->RejectAndTryNextServiceCallback();
mUserIdleServiceGTK->RejectAndTryNextServiceCallback();
}
}); });
return true; return true;
} }