12 files changed, 73 insertions, 2 deletions
diff --git a/data/gnome-wm-properties/Makefile b/data/gnome-wm-properties/Makefile
new file mode 100644
index 00000000..b90edacf
--- /dev/null
+++ b/data/gnome-wm-properties/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C .. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/data/gnome-wm-properties/openbox-gnome.desktop b/data/gnome-wm-properties/openbox-gnome.desktop
new file mode 100644
index 00000000..be8ff35f
--- /dev/null
+++ b/data/gnome-wm-properties/openbox-gnome.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Openbox/GNOME
+Exec=openbox-gnome
+
+# name we put on the WM spec check window
+X-GNOME-WMName=openbox-gnome
+
+# our config tool
+ConfigExec=obconf
diff --git a/data/gnome-wm-properties/openbox-kde.desktop b/data/gnome-wm-properties/openbox-kde.desktop
new file mode 100644
index 00000000..0208c328
--- /dev/null
+++ b/data/gnome-wm-properties/openbox-kde.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Openbox/GNOME
+Exec=openbox-kde
+
+# name we put on the WM spec check window
+X-GNOME-WMName=openbox-kde
+
+# our config tool
+ConfigExec=obconf
+
diff --git a/data/openbox.desktop b/data/gnome-wm-properties/openbox.desktop
index 559a1a00..96418613 100644
--- a/data/openbox.desktop
+++ b/data/gnome-wm-properties/openbox.desktop
@@ -3,7 +3,7 @@ Name=Openbox
 Exec=openbox
 
 # name we put on the WM spec check window
-X-GNOME-WMName=Openbox
+X-GNOME-WMName=openbox
 
 # our config tool
-ConfigExec=obconf2
+ConfigExec=obconf
diff --git a/data/xsession/Makefile b/data/xsession/Makefile
new file mode 100644
index 00000000..b90edacf
--- /dev/null
+++ b/data/xsession/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C .. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/data/xsession/openbox-gnome b/data/xsession/openbox-gnome
new file mode 100755
index 00000000..03a22d3f
--- /dev/null
+++ b/data/xsession/openbox-gnome
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# A temporary script to be replaced by a real program..
+export OPENBOX_RESTART_BINARY=openbox-gnome
+exec openbox "$@"
diff --git a/data/xsession/openbox-gnome-session b/data/xsession/openbox-gnome-session
new file mode 100755
index 00000000..d2b77014
--- /dev/null
+++ b/data/xsession/openbox-gnome-session
@@ -0,0 +1,5 @@
+#!/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.desktop b/data/xsession/openbox-gnome.desktop
new file mode 100644
index 00000000..a7ac098f
--- /dev/null
+++ b/data/xsession/openbox-gnome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Openbox/GNOME
+Comment=Use the Openbox window manager inside of the GNOME desktop environment
+Exec=openbox-gnome-session
+TryExec=gnome-session
+Icon=openbox.png
+Type=XSession
diff --git a/data/xsession/openbox-kde b/data/xsession/openbox-kde
new file mode 100755
index 00000000..a3b603ac
--- /dev/null
+++ b/data/xsession/openbox-kde
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# A temporary script to be replaced by a real program..
+export OPENBOX_RESTART_BINARY=openbox-kde
+exec openbox "$@"
diff --git a/data/xsession/openbox-kde-session b/data/xsession/openbox-kde-session
new file mode 100755
index 00000000..589a2c56
--- /dev/null
+++ b/data/xsession/openbox-kde-session
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Run KDE with Openbox as its window manager
+export KDEWM=openbox-kde
+exec startkde "$@"
diff --git a/data/xsession/openbox-kde.desktop b/data/xsession/openbox-kde.desktop
new file mode 100644
index 00000000..456b0df9
--- /dev/null
+++ b/data/xsession/openbox-kde.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Openbox/KDE
+Comment=Use the Openbox window manager inside of the K Desktop Environment
+Exec=openbox-kde-session
+TryExec=startkde
+Icon=openbox.png
+Type=XSession
diff --git a/data/xsession/openbox.desktop b/data/xsession/openbox.desktop
new file mode 100644
index 00000000..3b4d998e
--- /dev/null
+++ b/data/xsession/openbox.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Openbox
+Comment=Use this session to run Openbox as your desktop environment
+Exec=openbox
+TryExec=openbox-shell
+Icon=openbox.png
+Type=XSession