From b5a814ecc8d8f896e612a7ef52230bd935c47205 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:39:24 +0100 Subject: [PATCH] * usr/bin/start* : From LXDE upstream, make sure dbus is launched when it's necessary. --- debian/changelog | 2 ++ usr/bin/startlubuntu | 5 +++++ usr/bin/startlubuntu-netbook | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c66425c..a9af2fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. + * usr/bin/start* : + - From LXDE upstream, make sure dbus is launched when it's necessary. * Add custom defaults.list for applications by default. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 98cae6c..0627bad 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -47,5 +47,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 5d99b4b..2bbb1ed 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -47,5 +47,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