* usr/bin/start* : From LXDE upstream, make sure dbus is launched when it's necessary.

This commit is contained in:
Julien Lavergne 2010-02-28 13:39:24 +01:00
parent f04dc7c872
commit b5a814ecc8
3 changed files with 12 additions and 0 deletions

2
debian/changelog vendored
View File

@ -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 * Set iconsize to 22 and panel height to 24 for panel settings. It displays
correct icons size for panel icons. Thanks Leszek Lesner. 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. * Add custom defaults.list for applications by default.
-- Julien Lavergne <gilir@ubuntu.com> Fri, 19 Feb 2010 22:28:28 +0100 -- Julien Lavergne <gilir@ubuntu.com> Fri, 19 Feb 2010 22:28:28 +0100

View File

@ -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. # Enable GTK+2 integration for OpenOffice.org, if available.
export SAL_USE_VCLPLUGIN=gtk 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 # Start the LXDE session
exec /usr/bin/lxsession -s Lubuntu -e LXDE exec /usr/bin/lxsession -s Lubuntu -e LXDE

View File

@ -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. # Enable GTK+2 integration for OpenOffice.org, if available.
export SAL_USE_VCLPLUGIN=gtk 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 # Start the LXDE session
exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE