mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
45d4b225c6
And, just a month after Xfce 4.14 appeared in vtown, we have Xfce 4.16 updates in the main tree. Thanks much to Robby Workman for making it happen. :-) a/aaa_terminfo-6.2_20201219-x86_64-1.txz: Upgraded. a/ndctl-71.1-x86_64-2.txz: Rebuilt. Fix bash-completion file installation (previously it was causing the completion dir to have mode 0644). Thanks to Robby Workman. l/harfbuzz-2.7.4-x86_64-1.txz: Upgraded. l/libarchive-3.5.1-x86_64-1.txz: Upgraded. l/libgtop-2.40.0-x86_64-1.txz: Added. This is used by libxfce4ui to provide extra information in the about page. l/ncurses-6.2_20201219-x86_64-1.txz: Upgraded. n/wpa_supplicant-2.9-x86_64-4.txz: Rebuilt. Fix desktop file to not show if kdesu isn't available. Thanks to Hyperion. x/xterm-363-x86_64-1.txz: Upgraded. xap/xsnow-3.2.0-x86_64-1.txz: Upgraded. xfce/Greybird-3.22.13-noarch-2.txz: Rebuilt. xfce/exo-4.16.0-x86_64-1.txz: Upgraded. xfce/garcon-0.8.0-x86_64-1.txz: Upgraded. xfce/libxfce4ui-4.16.0-x86_64-1.txz: Upgraded. xfce/libxfce4util-4.16.0-x86_64-1.txz: Upgraded. xfce/mousepad-0.5.1-x86_64-2.txz: Rebuilt. xfce/thunar-4.16.0-x86_64-1.txz: Upgraded. xfce/thunar-volman-4.16.0-x86_64-1.txz: Upgraded. xfce/tumbler-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-appfinder-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-clipman-plugin-1.6.1-x86_64-2.txz: Rebuilt. xfce/xfce4-dev-tools-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-notifyd-0.6.2-x86_64-2.txz: Rebuilt. xfce/xfce4-panel-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-panel-profiles-1.0.10-x86_64-2.txz: Rebuilt. xfce/xfce4-power-manager-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-pulseaudio-plugin-0.4.3-x86_64-2.txz: Rebuilt. xfce/xfce4-screensaver-0.1.11-x86_64-3.txz: Rebuilt. xfce/xfce4-screenshooter-1.9.8-x86_64-1.txz: Upgraded. xfce/xfce4-session-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.16.0-x86_64-1.txz: Upgraded. xfce/xfce4-systemload-plugin-1.2.4-x86_64-2.txz: Rebuilt. xfce/xfce4-taskmanager-1.2.3-x86_64-2.txz: Rebuilt. xfce/xfce4-terminal-0.8.10-x86_64-1.txz: Upgraded. xfce/xfce4-weather-plugin-0.10.2-x86_64-2.txz: Rebuilt. xfce/xfce4-whiskermenu-plugin-2.5.0-x86_64-1.txz: Upgraded. xfce/xfconf-4.16.0-x86_64-1.txz: Upgraded. xfce/xfdesktop-4.16.0-x86_64-1.txz: Upgraded. xfce/xfwm4-4.16.0-x86_64-1.txz: Upgraded.
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 56d273ee48fffc7fed67ec7b22afd8e4b1c23c6e Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <fourdan@xfce.org>
|
|
Date: Fri, 25 Dec 2020 18:39:52 +0100
|
|
Subject: [PATCH] compositor: Ignore XError when changing background picture
|
|
|
|
If xfwm4 is compiled with support for the root pixmap in the compositor,
|
|
changing the background image may cause an XError if the external pixmap
|
|
is already freed.
|
|
|
|
Guard against such XError.
|
|
|
|
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
|
|
Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/476
|
|
---
|
|
src/compositor.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/src/compositor.c b/src/compositor.c
|
|
index 9c5ceb454..8ff0dad42 100644
|
|
--- a/src/compositor.c
|
|
+++ b/src/compositor.c
|
|
@@ -3774,8 +3774,11 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
|
|
ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window);
|
|
if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile))
|
|
{
|
|
+ myDisplayErrorTrapPush (display_info);
|
|
XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
|
|
XRenderFreePicture (display_info->dpy, screen_info->rootTile);
|
|
+ myDisplayErrorTrapPopIgnored (display_info);
|
|
+
|
|
screen_info->rootTile = None;
|
|
damage_screen (screen_info);
|
|
|
|
--
|
|
2.29.2
|
|
|