From 7d27d9d398b92e73aa47dd37e4418166c03bf0ca Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 03:12:44 +0000
Subject: kill the .in's for xml. we're not installing the xsd to the
 filesystem anymore anyways. kill the openbox-kde and openbox-gnome, we're
 going to have to do it different. put the full path to the openbox binary in
 the openbox-*-session files by using .in's

---
 data/xsession/openbox-gnome            | 4 ----
 data/xsession/openbox-gnome-session    | 5 -----
 data/xsession/openbox-gnome-session.in | 5 +++++
 data/xsession/openbox-kde              | 4 ----
 data/xsession/openbox-kde-session      | 5 -----
 data/xsession/openbox-kde-session.in   | 5 +++++
 6 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100755 data/xsession/openbox-gnome
 delete mode 100755 data/xsession/openbox-gnome-session
 create mode 100644 data/xsession/openbox-gnome-session.in
 delete mode 100755 data/xsession/openbox-kde
 delete mode 100755 data/xsession/openbox-kde-session
 create mode 100644 data/xsession/openbox-kde-session.in

(limited to 'data/xsession')

diff --git a/data/xsession/openbox-gnome b/data/xsession/openbox-gnome
deleted file mode 100755
index c146aa81..00000000
--- a/data/xsession/openbox-gnome
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# A temporary script to be replaced by a real program..
-exec openbox --restart-binary openbox-gnome "$@"
diff --git a/data/xsession/openbox-gnome-session b/data/xsession/openbox-gnome-session
deleted file mode 100755
index d2b77014..00000000
--- a/data/xsession/openbox-gnome-session
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Run GNOME with Openbox as its window manager
-export WINDOW_MANAGER=openbox-gnome
-exec gnome-session "$@"
diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
new file mode 100644
index 00000000..c2bc9399
--- /dev/null
+++ b/data/xsession/openbox-gnome-session.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Run GNOME with Openbox as its window manager
+export WINDOW_MANAGER="@bindir@/openbox"
+exec gnome-session "$@"
diff --git a/data/xsession/openbox-kde b/data/xsession/openbox-kde
deleted file mode 100755
index 87a5812c..00000000
--- a/data/xsession/openbox-kde
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# A temporary script to be replaced by a real program..
-exec openbox --restart-binary openbox-kde "$@"
diff --git a/data/xsession/openbox-kde-session b/data/xsession/openbox-kde-session
deleted file mode 100755
index 589a2c56..00000000
--- a/data/xsession/openbox-kde-session
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Run KDE with Openbox as its window manager
-export KDEWM=openbox-kde
-exec startkde "$@"
diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in
new file mode 100644
index 00000000..0fe00940
--- /dev/null
+++ b/data/xsession/openbox-kde-session.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Run KDE with Openbox as its window manager
+export KDEWM="@bindir@/openbox"
+exec startkde "$@"
-- 
cgit v1.2.3