From 46a698b0aa67bc18778eba3935179bd4ecfb8aaa Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Sat, 8 Apr 2017 20:22:10 -0400 Subject: [PATCH] mate-session-manager, handle firstrun setting --- helpers/DATA/mate-session-manager/mate-wm | 8 +++++++- helpers/make-mate-session-manager | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/helpers/DATA/mate-session-manager/mate-wm b/helpers/DATA/mate-session-manager/mate-wm index b2d1c00f5..e2853a521 100755 --- a/helpers/DATA/mate-session-manager/mate-wm +++ b/helpers/DATA/mate-session-manager/mate-wm @@ -74,7 +74,13 @@ fi # Avoid looping if the session configuration tells us to use mate-wm or if # the user forces mate-wm via WINDOW_MANAGER if [ "x$WINDOW_MANAGER" = "xmate-wm" ]; then - WINDOW_MANAGER="" + if [ $IS_X_COMPOSITED = 0 ]; then + WINDOW_MANAGER="marco-compton" + gsettings set org.mate.session.required-components windowmanager marco-compton + else + WINDOW_MANAGER="marco-no-composite" + gsettings set org.mate.session.required-components windowmanager marco-no-composite + fi fi if [ -z "$WINDOW_MANAGER" ] ; then diff --git a/helpers/make-mate-session-manager b/helpers/make-mate-session-manager index e8df10b3d..323404b0c 100644 --- a/helpers/make-mate-session-manager +++ b/helpers/make-mate-session-manager @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 . ./config -- GitLab