SHA256
7
0
forked from pool/lxde-common

checked in (request 32167)

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxde-common?expand=0&rev=32
This commit is contained in:
OBS User autobuild
2010-02-11 20:12:39 +00:00
committed by Git OBS Bridge
parent b8f66df242
commit 552b997c25
2 changed files with 7 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
diff -uNr old-lxde-common-0.5.0//startlxde.in lxde-common-0.5.0/startlxde.in
--- old-lxde-common-0.5.0//startlxde.in 2009-09-04 11:46:53.000000000 +0200
+++ lxde-common-0.5.0/startlxde.in 2010-02-09 17:36:12.345510727 +0100
@@ -21,8 +21,28 @@
+++ lxde-common-0.5.0/startlxde.in 2010-01-06 01:45:11.554944495 +0100
@@ -21,8 +21,29 @@
# Clean up after GDM (GDM sets the number of desktops to one)
xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
@@ -23,10 +23,11 @@ diff -uNr old-lxde-common-0.5.0//startlxde.in lxde-common-0.5.0/startlxde.in
# 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
+# allow LXDE to use gnome-keyring
+eval "`gnome-keyring-daemon`"
+export GNOME_KEYRING_PID
+export GNOME_KEYRING_SOCKET
+export SSH_AUTH_SOCK
+
# Start the LXDE session
-exec @prefix@/bin/lxsession -s LXDE

View File

@@ -1,9 +1,3 @@
-------------------------------------------------------------------
Tue Feb 9 12:40:40 UTC 2010 - andrea@opensuse.org
- lxsession export dbus information now, gnome-keyring now work
out of the box. Fixed bnc#564703
-------------------------------------------------------------------
Thu Dec 24 14:35:13 UTC 2009 - andrea@opensuse.org