From dceb5b1279855e9351c64421a0917906ea81764a Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sat, 2 Mar 2013 18:40:01 +0100
Subject: [PATCH] Revert use of new lxsession options until it manages the
 transition better (case when autostart is a system file, and desktop.conf a
 user file).

---
 debian/changelog                              |  2 --
 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, 13 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e98a0c..92a8f21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ 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.
   * etc/xdg/lubuntu/libfm
    - Use 16px for pcmanfm sidebar.
   * etc/xdg/lubuntu/menus:
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
index e5c78e5..2233f3b 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
@@ -1 +1,6 @@
 @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 265543e..762fb8a 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
@@ -1,20 +1,5 @@
 [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 9a9e8f0..613065c 100644
--- a/etc/xdg/lxsession/Lubuntu-Nexus7/autostart
+++ b/etc/xdg/lxsession/Lubuntu-Nexus7/autostart
@@ -1,3 +1,6 @@
 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 4007036..762fb8a 100644
--- a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
@@ -1,24 +1,5 @@
 [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 e69de29..a37d6de 100644
--- a/etc/xdg/lxsession/Lubuntu/autostart
+++ b/etc/xdg/lxsession/Lubuntu/autostart
@@ -0,0 +1,5 @@
+@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 265543e..762fb8a 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -1,20 +1,5 @@
 [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