From 307995389dcb809eca79b13355748fb748b4d770 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 18:07:53 +0100 Subject: [PATCH] * usr/bin/start* : - Ensure configuration files for libfm and pcmanfm2. - From LXDE upstream, make sur dbus is launched when it's necessary. --- debian/changelog | 4 +++- usr/bin/startlubuntu | 5 +++++ usr/bin/startlubuntu-netbook | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5eb959d..e57732c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. - * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. + * usr/bin/start* : + - Ensure configuration files for libfm and pcmanfm2. + - From LXDE upstream, make sur dbus is launched when it's necessary. * Use pcmanfm2.desktop in lxpanel panel settings. * Add custom defaults.list for applications by default. diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 9a33990..9faa5ae 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -59,5 +59,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu -e LXDE diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index d02d9ec..1c72815 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -59,5 +59,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE