This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-session.
commit 130915588c8be4f887d5b940015b14189f21df41 Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Sat Mar 28 22:30:15 2020 +0100 Try xfce screensaver before cinnamon (Bug #16223) If users install Xfce and Cinnamon in parallel the Cinnamon screensaver may otherwise get started in the Xfce session without the user's intention. --- xfce4-session/xfce-screensaver.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xfce4-session/xfce-screensaver.c b/xfce4-session/xfce-screensaver.c index 1ea24e7..2fa3d9a 100644 --- a/xfce4-session/xfce-screensaver.c +++ b/xfce4-session/xfce-screensaver.c @@ -71,8 +71,8 @@ typedef enum { SCREENSAVER_TYPE_NONE, SCREENSAVER_TYPE_FREEDESKTOP, - SCREENSAVER_TYPE_CINNAMON, SCREENSAVER_TYPE_XFCE, + SCREENSAVER_TYPE_CINNAMON, SCREENSAVER_TYPE_MATE, SCREENSAVER_TYPE_GNOME, SCREENSAVER_TYPE_OTHER, @@ -245,13 +245,6 @@ xfce_screensaver_setup(XfceScreenSaver *saver) DBG ("using freedesktop compliant screensaver daemon"); saver->priv->screensaver_type = SCREENSAVER_TYPE_FREEDESKTOP; } else if (screen_saver_proxy_setup (saver, - "org.cinnamon.ScreenSaver", - "/org/cinnamon/ScreenSaver", - "org.cinnamon.ScreenSaver")) - { - DBG ("using cinnamon screensaver daemon"); - saver->priv->screensaver_type = SCREENSAVER_TYPE_CINNAMON; - } else if (screen_saver_proxy_setup (saver, "org.xfce.ScreenSaver", "/org/xfce/ScreenSaver", "org.xfce.ScreenSaver")) @@ -259,6 +252,13 @@ xfce_screensaver_setup(XfceScreenSaver *saver) DBG ("using xfce screensaver daemon"); saver->priv->screensaver_type = SCREENSAVER_TYPE_XFCE; } else if (screen_saver_proxy_setup (saver, + "org.cinnamon.ScreenSaver", + "/org/cinnamon/ScreenSaver", + "org.cinnamon.ScreenSaver")) + { + DBG ("using cinnamon screensaver daemon"); + saver->priv->screensaver_type = SCREENSAVER_TYPE_CINNAMON; + } else if (screen_saver_proxy_setup (saver, "org.mate.ScreenSaver", "/org/mate/ScreenSaver", "org.mate.ScreenSaver")) -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits