From 42e4d78cc6bcc11bf24343b7e5f0e6c087b8459b Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sun, 14 Feb 2010 11:49:37 +0100
Subject: [PATCH] Add new Lubuntu-Netbook session, which launched lxlauncher by
 default.

---
 debian/changelog                              |  4 +-
 etc/xdg/lxsession/Lubuntu-Netbook/autostart   |  5 ++
 .../lxsession/Lubuntu-Netbook/desktop.conf    | 21 ++++++++
 usr/bin/startlubuntu-netbook                  | 51 +++++++++++++++++++
 usr/share/xsessions/Lubuntu-Netbook.desktop   |  7 +++
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 etc/xdg/lxsession/Lubuntu-Netbook/autostart
 create mode 100644 etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
 create mode 100644 usr/bin/startlubuntu-netbook
 create mode 100644 usr/share/xsessions/Lubuntu-Netbook.desktop

diff --git a/debian/changelog b/debian/changelog
index 62681e8..328dc05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 lubuntu-default-settings (0.5) UNRELEASED; urgency=low
 
-  * 
+  * Add new Lubuntu-Netbook session, which launched lxlauncher by default.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Sun, 24 Jan 2010 20:05:22 +0100
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 14 Feb 2010 11:44:16 +0100
 
 lubuntu-default-settings (0.4) lucid; urgency=low
 
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
new file mode 100644
index 0000000..878a5d1
--- /dev/null
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
@@ -0,0 +1,5 @@
+@xscreensaver -no-splash
+@nm-applet
+@lxlauncher
+@gnome-power-manager
+@pcmanfm -d
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
new file mode 100644
index 0000000..4508b52
--- /dev/null
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
@@ -0,0 +1,21 @@
+[Session]
+window_manager=openbox-lubuntu
+
+[GTK]
+sNet/ThemeName=Clearlooks
+sNet/IconThemeName=gnome-brave
+sGtk/FontName=Sans 10
+iGtk/ToolbarStyle=3
+iGtk/ButtonImages=1
+iGtk/MenuImages=1
+iGtk/CursorThemeSize=18
+iXft/Antialias=1
+
+[Mouse]
+AccFactor=20
+AccThreshold=10
+LeftHanded=0
+
+[Keyboard]
+Delay=500
+Interval=30
diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook
new file mode 100644
index 0000000..5d99b4b
--- /dev/null
+++ b/usr/bin/startlubuntu-netbook
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+    export XDG_CONFIG_HOME="$HOME/.config"
+fi
+
+#Allow custom configuration files in /etc/xdg/lubuntu
+#Patch stolen from Xubuntu
+if test "x$XDG_CONFIG_DIRS" = "x"
+then
+  XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg"
+else
+  XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg"
+fi
+export XDG_CONFIG_DIRS
+
+if test "x$XDG_DATA_DIRS" = "x"
+then
+ XDG_DATA_DIRS="/etc/xdg/lubuntu:/usr/local/share:/usr/share:/usr/share"
+ else
+ XDG_DATA_DIRS="/etc/xdg/lubuntu:$XDG_DATA_DIRS:/usr/share"
+fi
+export XDG_DATA_DIRS
+
+# Ensure the existance of pcmanfm config file
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
+if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then
+    mkdir -p "$PCMANFM_CONF_DIR"
+    cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu"
+fi
+
+# 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
+
+# Clean up after GDM (GDM sets the number of desktops to one)
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
+# Enable GTK+2 integration for OpenOffice.org, if available.
+export SAL_USE_VCLPLUGIN=gtk
+
+# Start the LXDE session
+exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE
diff --git a/usr/share/xsessions/Lubuntu-Netbook.desktop b/usr/share/xsessions/Lubuntu-Netbook.desktop
new file mode 100644
index 0000000..c1769ca
--- /dev/null
+++ b/usr/share/xsessions/Lubuntu-Netbook.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+# The names/descriptions should really be better
+Name=Lubuntu Netbook
+Comment=Lubuntu Netbook - Lightweight X11 desktop environment based on LXDE
+Exec=/usr/bin/startlubuntu-netbook
+# Icon=
+Type=Application