debian/patches: Add 1001_fix-mate-wm-script.patch. Fix mate-wm script that reports '<wm>' as WINDOW_MANAGER (quoted), not just <wm>. (Closes: #889907).
This commit is contained in:
@ -4,11 +4,9 @@ Date: Wed Dec 9 13:52:31 2015 +0100
|
|||||||
|
|
||||||
Enforce screen locking before requesting to switch to a different user.
|
Enforce screen locking before requesting to switch to a different user.
|
||||||
|
|
||||||
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
|
|
||||||
index db392b8..e654064 100644
|
|
||||||
--- a/mate-session/gsm-manager.c
|
--- a/mate-session/gsm-manager.c
|
||||||
+++ b/mate-session/gsm-manager.c
|
+++ b/mate-session/gsm-manager.c
|
||||||
@@ -3178,6 +3178,19 @@ logout_dialog_response (GsmLogoutDialog *logout_dialog,
|
@@ -3139,6 +3139,19 @@
|
||||||
case GTK_RESPONSE_DELETE_EVENT:
|
case GTK_RESPONSE_DELETE_EVENT:
|
||||||
break;
|
break;
|
||||||
case GSM_LOGOUT_RESPONSE_SWITCH_USER:
|
case GSM_LOGOUT_RESPONSE_SWITCH_USER:
|
||||||
@ -28,5 +26,3 @@ index db392b8..e654064 100644
|
|||||||
request_switch_user (manager);
|
request_switch_user (manager);
|
||||||
break;
|
break;
|
||||||
case GSM_LOGOUT_RESPONSE_HIBERNATE:
|
case GSM_LOGOUT_RESPONSE_HIBERNATE:
|
||||||
|
|
||||||
|
|
||||||
|
22
debian/patches/1001_fix-mate-wm-script.patch
vendored
Normal file
22
debian/patches/1001_fix-mate-wm-script.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Description: Strip outer single quotes from string value returned by gsettings in mate-wm script.
|
||||||
|
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
||||||
|
|
||||||
|
--- a/data/mate-wm
|
||||||
|
+++ b/data/mate-wm
|
||||||
|
@@ -1,5 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
+set -x
|
||||||
|
+
|
||||||
|
# The user can specify his prefered WM by setting the WINDOW_MANAGER
|
||||||
|
# environment variable.
|
||||||
|
#
|
||||||
|
@@ -42,7 +44,7 @@
|
||||||
|
|
||||||
|
# WINDOW_MANAGER overrides all
|
||||||
|
if [ -z "$WINDOW_MANAGER" ] ; then
|
||||||
|
- WINDOW_MANAGER=`gsettings get org.mate.session.required-components windowmanager 2> /dev/null`
|
||||||
|
+ WINDOW_MANAGER=`gsettings get org.mate.session.required-components windowmanager 2> /dev/null | sed -r -e "s/^'([^']*)'$/\\1/"`
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Migrate compiz to compiz-manager if possible and needed
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1 +1,2 @@
|
|||||||
0005_lock-session-before-user-switch.patch
|
0005_lock-session-before-user-switch.patch
|
||||||
|
1001_fix-mate-wm-script.patch
|
||||||
|
Reference in New Issue
Block a user