From aec4791cacc3ec853867338942c4879e126a509a Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 26 Nov 2009 19:54:35 +0100 Subject: [PATCH] Revert change to lxsession, it needs more hack to be usable. --- debian/changelog | 2 -- etc/xdg/{lubuntu/lxsession/LXDE => lxsession/Lubuntu}/autostart | 0 .../{lubuntu/lxsession/LXDE => lxsession/Lubuntu}/desktop.conf | 0 usr/bin/startlubuntu | 2 +- 4 files changed, 1 insertion(+), 3 deletions(-) rename etc/xdg/{lubuntu/lxsession/LXDE => lxsession/Lubuntu}/autostart (100%) rename etc/xdg/{lubuntu/lxsession/LXDE => lxsession/Lubuntu}/desktop.conf (100%) diff --git a/debian/changelog b/debian/changelog index 8e64791..dd3a129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,6 @@ lubuntu-default-settings (0.2) UNRELEASED; urgency=low * Move lxpanel background for Lubuntu to a specific file. * Use /etc/xdg/lubuntu to store custom configuration files. * Remove config file for lxsession, all is in desktop.conf - * Move lxsession configuration in etc/xdg/lubuntu, and launch a LXDE - session to workaround the bug of muliples icons in the menu. * Depends on lubuntu-artwork (>= 0.2) to bring the new lxpanel background. -- Julien Lavergne Fri, 06 Nov 2009 18:58:46 +0100 diff --git a/etc/xdg/lubuntu/lxsession/LXDE/autostart b/etc/xdg/lxsession/Lubuntu/autostart similarity index 100% rename from etc/xdg/lubuntu/lxsession/LXDE/autostart rename to etc/xdg/lxsession/Lubuntu/autostart diff --git a/etc/xdg/lubuntu/lxsession/LXDE/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf similarity index 100% rename from etc/xdg/lubuntu/lxsession/LXDE/desktop.conf rename to etc/xdg/lxsession/Lubuntu/desktop.conf diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 5d1aabc..d16582c 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -34,4 +34,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ export SAL_USE_VCLPLUGIN=gtk # Start the LXDE session -exec /usr/bin/lxsession -s LXDE +exec /usr/bin/lxsession -s Lubuntu