diff options
| author | Noé Lopez <noelopez@free.fr> | 2025-04-03 09:34:59 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2025-04-13 18:18:15 +0200 |
| commit | 7f0ec135d1bf6fd8b7bff84bc176b6c61fdee75d (patch) | |
| tree | 5de75b73f415ccb2af62c9e18f31aec30a5b76ae | |
| parent | 5c7b3070925905208848df7679f3b5d636132cba (diff) | |
| download | guix-7f0ec135d1bf6fd8b7bff84bc176b6c61fdee75d.tar.gz guix-7f0ec135d1bf6fd8b7bff84bc176b6c61fdee75d.zip | |
gnu: gnome-settings-daemon: Fix crash when no screen saver available.
Change-Id: Ic6da39489eb2e04f98ae112e6cd2cdb7340bd00e
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc08ca9a2b..d9ecfea832 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6154,7 +6154,9 @@ services for numerous locations.") (sha256 (base32 "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) (arguments (list diff --git a/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch b/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch new file mode 100644 index 0000000000..6707502261 --- /dev/null +++ b/gnu/packages/patches/gnome-settings-daemon-screensaver-error.patch @@ -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; + } |