diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-03-28 22:30:15 +0100 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-03-28 22:31:40 +0100 |
| commit | 130915588c8be4f887d5b940015b14189f21df41 (patch) | |
| tree | 3cf0e1cbf04a0e79b4dcab70ae5c4f219cd85e88 /xfce4-session | |
| parent | 0c4496b3c989e5e200afb0abd7f61ff65f1bebc8 (diff) | |
| download | xfce4-session-130915588c8be4f887d5b940015b14189f21df41.tar.gz | |
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.
Diffstat (limited to 'xfce4-session')
| -rw-r--r-- | xfce4-session/xfce-screensaver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfce4-session/xfce-screensaver.c b/xfce4-session/xfce-screensaver.c index 1ea24e7a..2fa3d9a3 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")) |