File lxde-common-startlxde.diff of Package lxde-common

Overview Repositories Revisions Requests Users Attributes Meta

File lxde-common-startlxde.diff of Package lxde-common (Revision f7573977b230eb6dfe282505d369adf0)

Currently displaying revision f7573977b230eb6dfe282505d369adf0 , Show latest

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-11-21 10:04:37.213477678 +0100
@@ -6,9 +6,9 @@
 
 # Ensure the existance of pcmanfm config file
 PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-    mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
+if [ ! -f "$PCMANFM_CONF_DIR/default/pcmanfm.conf" ]; then
+    mkdir -p "$PCMANFM_CONF_DIR/default"
+    cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/default/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file
@@ -21,8 +21,31 @@
 # 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
 
+# Ensure that LXDE default settings are loaded
+LXDE_CONF_DIR="$XDG_CONFIG_HOME/lxde"
+if [ ! -f "$LXDE_CONF_DIR/desktop.conf" ]; then
+    mkdir -p "$LXDE_CONF_DIR"
+    cp /etc/xdg/lxsession/LXDE/desktop.conf "$LXDE_CONF_DIR/desktop.conf"
+fi
+
+# Ensure the Desktop folder exist
+if [ -e .config/user-dirs.dirs ]; then
+   . .config/user-dirs.dirs
+else
+   XDG_DESKTOP_DIR="$HOME/Desktop"
+fi
+mkdir -p $XDG_DESKTOP_DIR
+
 # 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
+
+# fixed bug bnc#591407
+export XDG_MENU_PREFIX="lxde-"
+
 # Start the LXDE session
-exec @prefix@/bin/lxsession -s LXDE
+exec @prefix@/bin/lxsession -s LXDE -e LXDE

Places

File lxde-common-startlxde.diff of Package lxde-common (Revision f7573977b230eb6dfe282505d369adf0)

Places