From 8a6ebb34ef601cb2416b45c28de23b90e8c300b4 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sat, 27 Apr 2013 15:40:47 +0200
Subject: [PATCH] Use conffiles optins in lxsession, and remove contents in
 startlubuntu

---
 etc/xdg/lxsession/Lubuntu/conffiles.conf | 14 ++++++++++++
 etc/xdg/lxsession/Lubuntu/desktop.conf   |  4 ++++
 usr/bin/startlubuntu                     | 29 ------------------------
 3 files changed, 18 insertions(+), 29 deletions(-)
 create mode 100644 etc/xdg/lxsession/Lubuntu/conffiles.conf

diff --git a/etc/xdg/lxsession/Lubuntu/conffiles.conf b/etc/xdg/lxsession/Lubuntu/conffiles.conf
new file mode 100644
index 0000000..2014e5b
--- /dev/null
+++ b/etc/xdg/lxsession/Lubuntu/conffiles.conf
@@ -0,0 +1,14 @@
+[Openbox]
+source=/usr/share/lubuntu/openbox/rc.xml
+
+[XScreensaver]
+source=/usr/share/lubuntu/xscreensaver/xscreensaver
+
+[Qt]
+source=/usr/share/lubuntu/qt/Trolltech.conf
+
+[Leafpad]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[LXterminal]
+source=/usr/share/lubuntu/leafpad/leafpadrc
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
index d231281..4776606 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -72,6 +72,10 @@ type=
 [Updates]
 activate=true
 
+[Environment]
+type=lubuntu
+menu_prefix=lxde-
+
 [GTK]
 sNet/ThemeName=Lubuntu-default
 sNet/IconThemeName=lubuntu
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 67e837e..79a4d7a 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -1,33 +1,4 @@
 #!/bin/sh
 
-# Ensure the existance of openbox config file
-OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
-if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then
-    mkdir -p "$OPENBOX_CONF_DIR"
-    cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml"
-fi
-
-# Install custom QT configuration if no one is already installed
-if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
-    cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf"
-fi
-
-# Install custom configuration for leafpad
-LEAFPAD_CONF_DIR="$XDG_CONFIG_HOME/leafpad"
-if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then
-    mkdir -p "$LEAFPAD_CONF_DIR"
-    cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc"
-fi
-
-# Install custom configuration for xscreensaver
-if [ ! -f "$HOME/.xscreensaver" ]; then
-    cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver"
-fi
-
-# Install custom lxterminal configuration if no one is already installed
-if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then
-    cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf"
-fi
-
 # Start the LXDE session
 exec /usr/bin/lxsession -s Lubuntu -e LXDE