mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: gnome-settings-daemon: Fix crash when no screen saver available.
Change-Id: Ic6da39489eb2e04f98ae112e6cd2cdb7340bd00e Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
parent
5c7b307092
commit
7f0ec135d1
2 changed files with 17 additions and 1 deletions
|
@ -6154,7 +6154,9 @@ services for numerous locations.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0nka7zfl4hzzk4066kk5cc8pmk7v3izhi4wihsh5b3w85s35idqy"))
|
"0nka7zfl4hzzk4066kk5cc8pmk7v3izhi4wihsh5b3w85s35idqy"))
|
||||||
(patches (search-patches "gnome-settings-daemon-gc.patch"))))
|
(patches (search-patches "gnome-settings-daemon-gc.patch"
|
||||||
|
;; See https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/792
|
||||||
|
"gnome-settings-daemon-screensaver-error.patch"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
diff --git a/plugins/usb-protection/gsd-usb-protection-manager.c b/plugins/usb-protection/gsd-usb-protection-manager.c
|
||||||
|
index 43644408..fef13645 100644
|
||||||
|
--- a/plugins/usb-protection/gsd-usb-protection-manager.c
|
||||||
|
+++ b/plugins/usb-protection/gsd-usb-protection-manager.c
|
||||||
|
@@ -1089,8 +1089,7 @@ usb_protection_proxy_ready (GObject *source_object,
|
||||||
|
|
||||||
|
manager->screensaver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
|
||||||
|
if (!manager->screensaver_proxy) {
|
||||||
|
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
||||||
|
- g_warning ("Failed to connect to screensaver service: %s", error->message);
|
||||||
|
+ g_warning ("Failed to connect to screensaver service");
|
||||||
|
g_clear_object (&manager->usb_protection);
|
||||||
|
return;
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue