From c10d44c109d6d207b3065804e5e1aaea33630dce Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sat, 15 Dec 2012 21:25:39 +0100
Subject: [PATCH] * etc/xdg/lxsession :  - Use new lxsession features instead
 of autostart commands.

---
 debian/changelog                              |  4 +++-
 etc/xdg/lxsession/Lubuntu-Netbook/autostart   |  5 -----
 .../lxsession/Lubuntu-Netbook/desktop.conf    | 15 +++++++++++++++
 etc/xdg/lxsession/Lubuntu-Nexus7/autostart    |  3 ---
 etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf | 19 +++++++++++++++++++
 etc/xdg/lxsession/Lubuntu/autostart           |  5 -----
 etc/xdg/lxsession/Lubuntu/desktop.conf        | 15 +++++++++++++++
 7 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b962dc..b749fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ lubuntu-default-settings (0.31) UNRELEASED; urgency=low
   * Add a new Lubuntu-Nexus7 session.
   * debian/lubuntu-default-settings:
    - Exclude nexus7 specific items.
+  * etc/xdg/lxsession :
+   - Use new lxsession features instead of autostart commands.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Tue, 27 Nov 2012 21:50:27 +0100
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 28 Nov 2012 19:56:19 +0100
 
 lubuntu-default-settings (0.30) raring; urgency=low
 
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
index 2233f3b..e5c78e5 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
@@ -1,6 +1 @@
 @lxlauncher
-@lxpanel --profile Lubuntu
-@xscreensaver -no-splash
-@xfce4-power-manager
-@pcmanfm --desktop
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
index 762fb8a..265543e 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
@@ -1,5 +1,20 @@
 [Session]
 window_manager=openbox-lubuntu
+panel/program=lxpanel
+panel/session=Lubuntu
+screensaver/program=xscreensaver
+power-manager/program=xfce4-power-manager
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+polkit=gnome
+
+[Dbus]
+lxde=true
+gnome=true
+
+[Security]
+keyring=gnome-all
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/autostart b/etc/xdg/lxsession/Lubuntu-Nexus7/autostart
index 613065c..9a9e8f0 100644
--- a/etc/xdg/lxsession/Lubuntu-Nexus7/autostart
+++ b/etc/xdg/lxsession/Lubuntu-Nexus7/autostart
@@ -1,6 +1,3 @@
 xrotate
 @lxlauncher
-@lxpanel --profile Lubuntu-Nexus7
-@xfce4-power-manager
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 @onboard
diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf b/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
index 762fb8a..4007036 100644
--- a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
@@ -1,5 +1,24 @@
 [Session]
 window_manager=openbox-lubuntu
+panel/program=lxpanel
+panel/session=Lubuntu-Nexus7
+screensaver/program=xscreensaver
+power-manager/program=xfce4-power-manager
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+polkit=gnome
+
+[Dbus]
+lxde=true
+gnome=true
+
+[Security]
+keyring=gnome-all
+
+[a11y]
+activate=yes
+type=gnome
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart
index a37d6de..e69de29 100644
--- a/etc/xdg/lxsession/Lubuntu/autostart
+++ b/etc/xdg/lxsession/Lubuntu/autostart
@@ -1,5 +0,0 @@
-@lxpanel --profile Lubuntu
-@xscreensaver -no-splash
-@xfce4-power-manager
-@pcmanfm --desktop --profile lubuntu
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
index 762fb8a..265543e 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -1,5 +1,20 @@
 [Session]
 window_manager=openbox-lubuntu
+panel/program=lxpanel
+panel/session=Lubuntu
+screensaver/program=xscreensaver
+power-manager/program=xfce4-power-manager
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+polkit=gnome
+
+[Dbus]
+lxde=true
+gnome=true
+
+[Security]
+keyring=gnome-all
 
 [GTK]
 sNet/ThemeName=Lubuntu-default