Petr Lautrbach 907549e
From 7bf4ac2438df52b259b9d3d539b9a9e889cc7424 Mon Sep 17 00:00:00 2001
18e735d
From: Petr Lautrbach <plautrba@redhat.com>
18e735d
Date: Wed, 18 Jul 2018 09:09:35 +0200
18e735d
Subject: [PATCH] sandbox: Use matchbox-window-manager instead of openbox
013d1dc
Content-type: text/plain
18e735d
18e735d
---
18e735d
 sandbox/sandbox     |  4 ++--
18e735d
 sandbox/sandbox.8   |  2 +-
18e735d
 sandbox/sandboxX.sh | 14 --------------
18e735d
 3 files changed, 3 insertions(+), 17 deletions(-)
18e735d
18e735d
diff --git a/sandbox/sandbox b/sandbox/sandbox
Petr Lautrbach 9c3b442
index a2762a7d215a..a32a33ea3cf6 100644
18e735d
--- a/sandbox/sandbox
18e735d
+++ b/sandbox/sandbox
Petr Lautrbach 577b79d
@@ -270,7 +270,7 @@ class Sandbox:
18e735d
             copyfile(f, "/tmp", self.__tmpdir)
18e735d
             copyfile(f, "/var/tmp", self.__tmpdir)
18e735d
 
18e735d
-    def __setup_sandboxrc(self, wm="/usr/bin/openbox"):
18e735d
+    def __setup_sandboxrc(self, wm="/usr/bin/matchbox-window-manager"):
18e735d
         execfile = self.__homedir + "/.sandboxrc"
18e735d
         fd = open(execfile, "w+")
18e735d
         if self.__options.session:
Petr Lautrbach 577b79d
@@ -369,7 +369,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-
18e735d
 
18e735d
         parser.add_option("-W", "--windowmanager", dest="wm",
18e735d
                           type="string",
18e735d
-                          default="/usr/bin/openbox",
18e735d
+                          default="/usr/bin/matchbox-window-manager",
18e735d
                           help=_("alternate window manager"))
18e735d
 
18e735d
         parser.add_option("-l", "--level", dest="level",
18e735d
diff --git a/sandbox/sandbox.8 b/sandbox/sandbox.8
Petr Lautrbach 907549e
index 095b9e27042d..1c1870190e51 100644
18e735d
--- a/sandbox/sandbox.8
18e735d
+++ b/sandbox/sandbox.8
Petr Lautrbach 577b79d
@@ -80,7 +80,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz
18e735d
 \fB\-W\fR \fB\-\-windowmanager\fR
Petr Lautrbach 907549e
 Select alternative window manager to run within
18e735d
 .B sandbox \-X.
18e735d
-Default to /usr/bin/openbox.
18e735d
+Default to /usr/bin/matchbox-window-manager.
18e735d
 .TP
Petr Lautrbach 907549e
 \fB\-X\fR
18e735d
 Create an X based Sandbox for gui apps, temporary files for
18e735d
diff --git a/sandbox/sandboxX.sh b/sandbox/sandboxX.sh
da2585a
index 4774528027ef..c211ebc14549 100644
18e735d
--- a/sandbox/sandboxX.sh
18e735d
+++ b/sandbox/sandboxX.sh
18e735d
@@ -6,20 +6,6 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8
18e735d
 [ -z $2 ] && export DPI="96" || export DPI="$2"
18e735d
 trap "exit 0" HUP
18e735d
 
18e735d
-mkdir -p ~/.config/openbox
18e735d
-cat > ~/.config/openbox/rc.xml << EOF
18e735d
-
18e735d
-		xmlns:xi="http://www.w3.org/2001/XInclude">
18e735d
-<applications>
18e735d
-  <application class="*">
18e735d
-    <decor>no</decor>
18e735d
-    <desktop>all</desktop>
18e735d
-    <maximized>yes</maximized>
18e735d
-  </application>
18e735d
-</applications>
18e735d
-</openbox_config>
18e735d
-EOF
18e735d
-
18e735d
 (/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
18e735d
     export DISPLAY=:$D
18e735d
     cat > ~/seremote << __EOF
18e735d
-- 
Petr Lautrbach 907549e
2.41.0
18e735d