disable redundant gpg- and ssh-agent in xfce4-session

diff --git a/modules/xfce.mk b/modules/xfce.mk
index b6bf64a356a27698f7840c189a855b3067aaae75..8befb60628e9a5c426a34415d0d33a0f4edee06f 100644 (file)
--- a/modules/xfce.mk
+++ b/modules/xfce.mk
@@ -1,11 +1,22 @@
-PACKAGES += ark blueman breeze-gtk-theme elementary-xfce-icon-theme gvfs gvfs-backends gvfs-fuse mate-polkit onboard pulseaudio pulseaudio-module-bluetooth thunar tumbler x11-xserver-utils x2x xauth xinput xfce4 xfce4-clipman-plugin xfce4-screensaver xfce4-terminal xfce4-whiskermenu-plugin zenity
-
+PACKAGES += ark blueman breeze-gtk-theme elementary-xfce-icon-theme gvfs gvfs-backends gvfs-fuse mate-polkit onboard pinentry-gnome3 pulseaudio pulseaudio-module-bluetooth thunar tumbler x11-xserver-utils x2x xauth xinput xfce4 xfce4-clipman-plugin xfce4-screensaver xfce4-terminal xfce4-whiskermenu-plugin zenity
 
 .PHONY: _xfce
 _config: _xfce
 _xfce: ${CFGROOT} modules/xfce/
        cp -a modules/xfce/. "$${CFGROOT}"
 
+_config: ${CFGROOT}/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+${CFGROOT}/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml: ${CFGROOT}
+       sed -i '/<\/channel>/i\
+         <property name="startup" type="empty">\
+           <property name="ssh-agent" type="empty">\
+             <property name="enabled" type="bool" value="false"/>\
+           </property>\
+           <property name="gpg-agent" type="empty">\
+             <property name="enabled" type="bool" value="false"/>\
+           </property>\
+         </property>' "$@"
+
 # # requires package dconf-cli and file /etc/dconf/db/user.d/*
 # .PHONY: _dconf
 # _config: _dconf