Convert all session with new lxsession options

etc/xdg/lxsession/LX-Games/conffiles.conf

@@ -0,0 +1,17 @@
+[Openbox]
+source=/usr/share/lubuntu/openbox/rc.xml
+
+[XScreensaver]
+source=/usr/share/lubuntu/xscreensaver/xscreensaver
+
+[Qt]
+source=/usr/share/lubuntu/qt/Trolltech.conf
+
+[Leafpad]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[LXterminal]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[libfm]
+source=/etc/xdg/lubuntu/libfm/libfm.conf

etc/xdg/lxsession/LX-Games/desktop.conf

@@ -0,0 +1,109 @@
+[Session]
+window_manager/program=openbox
+window_manager/session=Lubuntu
+window_manager/extras=
+
+panel/program=lxpanel
+panel/session=Lubuntu
+
+screensaver/program=
+
+power-manager/program=auto
+
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+
+desktop-manager/command=lxlauncher
+desktop-manager/wallpaper=
+
+polkit=lxpolkit
+
+network_gui=auto
+
+audio_manager=alsamixer
+
+quit_manager/command=lxsession-logout
+quit_manager/image=/usr/share/lubuntu/images/logout-banner.png
+quit_manager/layout=top
+
+workspace_manager=obconf
+
+launcher_manager=lxpanelctl
+
+terminal_manager=x-terminal-emulator
+
+screenshot_manager=scrot
+
+upgrades_manager=update-manager
+
+clipboard=lxclipboard
+
+composite_manager/command=
+composite_manager/autostart=true
+
+disable_autostart=config-only
+
+upstart_user_session=true
+
+webbrowser/command=x-www-browser
+webbrowser/desktop=
+
+[State]
+laptop_mode=unknown
+
+[Dbus]
+lxde=true
+gnome=false
+
+[Keymap]
+mode=system
+model=
+layout=
+variant=
+options=
+
+[XRandr]
+mode=
+command=
+
+[Security]
+keyring=no
+
+[a11y]
+activate=no
+type=
+
+[Updates]
+activate=true
+
+[Environment]
+type=lubuntu
+menu_prefix=lxgames-
+
+[GTK]
+sNet/ThemeName=Lubuntu-default
+sNet/IconThemeName=lubuntu
+sGtk/FontName=Ubuntu 11
+iGtk/ToolbarStyle=3
+iGtk/ButtonImages=1
+iGtk/MenuImages=1
+iGtk/CursorThemeSize=18
+iXft/Antialias=1
+iXft/Hinting=1
+sXft/HintStyle=hintslight
+sXft/RGBA=rgb
+sGtk/CursorThemeName=DMZ-White
+sGtk/ColorScheme=
+iGtk/ToolbarIconSize=3
+iNet/EnableEventSounds=1
+iNet/EnableInputFeedbackSounds=1
+
+[Mouse]
+AccFactor=20
+AccThreshold=10
+LeftHanded=0
+
+[Keyboard]
+Delay=500
+Interval=30

etc/xdg/lxsession/Lubuntu-Netbook/autostart

@@ -1,6 +0,0 @@
-@lxlauncher
-@lxpanel --profile Lubuntu
-@xscreensaver -no-splash
-@xfce4-power-manager
-@pcmanfm --desktop
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1

etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf

@@ -0,0 +1,17 @@
+[Openbox]
+source=/usr/share/lubuntu/openbox/rc.xml
+
+[XScreensaver]
+source=/usr/share/lubuntu/xscreensaver/xscreensaver
+
+[Qt]
+source=/usr/share/lubuntu/qt/Trolltech.conf
+
+[Leafpad]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[LXterminal]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[libfm]
+source=/etc/xdg/lubuntu/libfm/libfm.conf

etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf

@@ -1,5 +1,85 @@
 [Session]
-window_manager=openbox-lubuntu
+window_manager/program=openbox
+window_manager/session=Lubuntu
+window_manager/extras=
+
+panel/program=lxpanel
+panel/session=Lubuntu
+
+screensaver/program=
+
+power-manager/program=auto
+
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+
+desktop-manager/command=lxlauncher
+desktop-manager/wallpaper=
+
+polkit=lxpolkit
+
+network_gui=auto
+
+audio_manager=alsamixer
+
+quit_manager/command=lxsession-logout
+quit_manager/image=/usr/share/lubuntu/images/logout-banner.png
+quit_manager/layout=top
+
+workspace_manager=obconf
+
+launcher_manager=lxpanelctl
+
+terminal_manager=x-terminal-emulator
+
+screenshot_manager=scrot
+
+upgrades_manager=update-manager
+
+clipboard=lxclipboard
+
+composite_manager/command=
+composite_manager/autostart=true
+
+disable_autostart=config-only
+
+upstart_user_session=true
+
+webbrowser/command=x-www-browser
+webbrowser/desktop=
+
+[State]
+laptop_mode=unknown
+
+[Dbus]
+lxde=true
+gnome=false
+
+[Keymap]
+mode=system
+model=
+layout=
+variant=
+options=
+
+[XRandr]
+mode=
+command=
+
+[Security]
+keyring=no
+
+[a11y]
+activate=no
+type=
+
+[Updates]
+activate=true
+
+[Environment]
+type=lubuntu
+menu_prefix=lxde-
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
@@ -14,6 +94,10 @@ iXft/Hinting=1
 sXft/HintStyle=hintslight
 sXft/RGBA=rgb
 sGtk/CursorThemeName=DMZ-White
+sGtk/ColorScheme=
+iGtk/ToolbarIconSize=3
+iNet/EnableEventSounds=1
+iNet/EnableInputFeedbackSounds=1
 
 [Mouse]
 AccFactor=20

etc/xdg/lxsession/Lubuntu-Nexus7/autostart

@@ -1,6 +0,0 @@
-xrotate
-@lxlauncher
-@lxpanel --profile Lubuntu-Nexus7
-@xfce4-power-manager
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-@onboard

etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf

@@ -0,0 +1,17 @@
+[Openbox]
+source=/usr/share/lubuntu/openbox/nexus-rc.xml
+
+[XScreensaver]
+source=/usr/share/lubuntu/xscreensaver/xscreensaver
+
+[Qt]
+source=/usr/share/lubuntu/qt/Trolltech.conf
+
+[Leafpad]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[LXterminal]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[libfm]
+source=/etc/xdg/lubuntu/libfm/libfm.conf

etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf

@@ -1,5 +1,85 @@
 [Session]
-window_manager=openbox-lubuntu
+window_manager/program=openbox
+window_manager/session=Lubuntu
+window_manager/extras=
+
+panel/program=lxpanel
+panel/session=Lubuntu-Nexus7
+
+screensaver/program=
+
+power-manager/program=auto
+
+file-manager/program=pcmanfm
+file-manager/session=lubuntu
+file-manager/extras=
+
+desktop-manager/command=lxlauncher
+desktop-manager/wallpaper=
+
+polkit=lxpolkit
+
+network_gui=auto
+
+audio_manager=alsamixer
+
+quit_manager/command=lxsession-logout
+quit_manager/image=/usr/share/lubuntu/images/logout-banner.png
+quit_manager/layout=top
+
+workspace_manager=obconf
+
+launcher_manager=lxpanelctl
+
+terminal_manager=x-terminal-emulator
+
+screenshot_manager=scrot
+
+upgrades_manager=update-manager
+
+clipboard=lxclipboard
+
+composite_manager/command=
+composite_manager/autostart=true
+
+disable_autostart=config-only
+
+upstart_user_session=true
+
+webbrowser/command=x-www-browser
+webbrowser/desktop=
+
+[State]
+laptop_mode=unknown
+
+[Dbus]
+lxde=true
+gnome=false
+
+[Keymap]
+mode=system
+model=
+layout=
+variant=
+options=
+
+[XRandr]
+mode=
+command=
+
+[Security]
+keyring=no
+
+[a11y]
+activate=yes
+type=gnome
+
+[Updates]
+activate=true
+
+[Environment]
+type=lubuntu
+menu_prefix=lxde-
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
@@ -14,6 +94,10 @@ iXft/Hinting=1
 sXft/HintStyle=hintslight
 sXft/RGBA=rgb
 sGtk/CursorThemeName=DMZ-White
+sGtk/ColorScheme=
+iGtk/ToolbarIconSize=3
+iNet/EnableEventSounds=1
+iNet/EnableInputFeedbackSounds=1
 
 [Mouse]
 AccFactor=20

etc/xdg/lxsession/Lubuntu/desktop.conf

@@ -14,6 +14,9 @@ file-manager/program=pcmanfm
 file-manager/session=lubuntu
 file-manager/extras=
 
+desktop-manager/command=filemanager
+desktop-manager/wallpaper=
+
 polkit=lxpolkit
 
 network_gui=auto
@@ -41,6 +44,8 @@ composite_manager/autostart=true
 
 disable_autostart=config-only
 
+upstart_user_session=true
+
 webbrowser/command=x-www-browser
 webbrowser/desktop=
 

etc/xdg/lxsession/QLubuntu/conffiles.conf

@@ -0,0 +1,17 @@
+[Openbox]
+source=/usr/share/lubuntu/openbox/qt-rc.xml
+
+[XScreensaver]
+source=/usr/share/lubuntu/xscreensaver/xscreensaver
+
+[Qt]
+source=/usr/share/lubuntu/qt/Trolltech.conf
+
+[Leafpad]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[LXterminal]
+source=/usr/share/lubuntu/leafpad/leafpadrc
+
+[libfm]
+source=/etc/xdg/lubuntu/libfm/libfm.conf

etc/xdg/lxsession/QLubuntu/desktop.conf

@@ -1,95 +1,86 @@
 [Session]
-# Window manager : Advanced mode to launch the window manager (with session, usefull for launching openbox with specific arguments (like configuration file) and extras commands)
 window_manager/program=openbox
-window_manager/session=
+window_manager/session=Lubuntu
-window_manager/extras=--config-file $XDG_CONFIG_HOME/openbox/qt-rc.xml
+window_manager/extras=
 
-# Panel and its session (if necessary)
 panel/program=qtpanel
 panel/session=
 
-# Screensaver
 screensaver/program=
 
-# Power management
+power-manager/program=auto
-power-manager/program=
 
-# File manager (session if necessary, extras commands if necessary)
+file-manager/program=pcmanfm
-file-manager/program=pcmanfm-qt
+file-manager/session=lubuntu
-file-manager/session=
 file-manager/extras=
 
-# Polkit agent (use lxpolkit to use build-in support if enable at build time)
+desktop-manager/command=lxlauncher
+desktop-manager/wallpaper=
+
 polkit=razor-policykit-agent
 
-# Network GUI manager (auto to try to guess the best choice)
+network_gui=auto
-network_gui=
 
-# Audio preferences (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.AudioManagerLaunch)
+audio_manager=alsamixer
-audio_manager=
 
-# Logout dialog (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.QuitManagerLaunch)
+quit_manager/command=razor-power
-quit_manager=razor-power
+quit_manager/image=
+quit_manager/layout=
 
-# Workspace manager (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.WorkspaceManagerLaunch)
 workspace_manager=
 
-# Launcher to launch applications (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.LauncherManagerLaunch)
 launcher_manager=
 
-# Terminal by default (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.TerminalManagerLaunch)
 terminal_manager=x-terminal-emulator
 
-# Clipboard support (use lxclipboard to use build-in support if enable at build time)
+screenshot_manager=scrot
-clipboard=
+
+upgrades_manager=update-manager
+
+clipboard=lxclipboard
 
-# Use a standalone composite manager (with possibility to autostart it)
 composite_manager/command=
-composite_manager/autostart=
+composite_manager/autostart=true
 
-# Disable autostart of applications in system and home autostart directory
+disable_autostart=config-only
-disable_autostart=true
 
-# Default web browser (desktop is the corresponding desktop file)
+upstart_user_session=true
-webbrowser/command=arora
+
+webbrowser/command=x-www-browser
 webbrowser/desktop=
 
 [State]
-# unknown if untested, yes if on laptop, no if not
 laptop_mode=unknown
 
 [Dbus]
-# Default Dbus interfaces, should be always true
 lxde=true
-# Implement gnome-session Dbus API
 gnome=false
 
 [Keymap]
-# Read configuration from : user (this file) or system
+mode=system
-mode=
-# Keyboard configuration for user mode, all 4 should be present
 model=
 layout=
 variant=
 options=
 
 [XRandr]
-# Mode command only available
 mode=
-# Command to launch for configuring Xrandr ex: xrandr --mode ...
 command=
 
 [Security]
-# Default Keyring program
+keyring=no
-keyring=gnome-all
 
 [a11y]
-# Accessibility options
-# Activate or not the following options
 activate=no
-# Type of accessibility to enable (GNOME, KDE or other). Only GNOME supported now.
 type=
 
+[Updates]
+activate=true
+
+[Environment]
+type=lubuntu
+menu_prefix=lxde-
+
 [GTK]
 sNet/ThemeName=Lubuntu-default
 sNet/IconThemeName=lubuntu
@@ -103,6 +94,10 @@ iXft/Hinting=1
 sXft/HintStyle=hintslight
 sXft/RGBA=rgb
 sGtk/CursorThemeName=DMZ-White
+sGtk/ColorScheme=
+iGtk/ToolbarIconSize=3
+iNet/EnableEventSounds=1
+iNet/EnableInputFeedbackSounds=1
 
 [Mouse]
 AccFactor=20

usr/share/xsessions/Lubuntu-Netbook.desktop

@@ -2,6 +2,6 @@
 # The names/descriptions should really be better
 Name=Lubuntu Netbook
 Comment=Lubuntu Netbook - Lightweight X11 desktop environment based on LXDE
-Exec=/usr/bin/startlubuntu-netbook
+Exec=/usr/bin/lxsession -s Lubuntu-Netbook -e LXDE
 # Icon=
 Type=Application

usr/share/xsessions/lubuntu-nexus7.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Lubuntu Nexus7 session
 Comment=A specific Lubuntu session optimised for Nexus7
-Exec=/usr/bin/startlubuntu-nexus7
+Exec=/usr/bin/lxsession -s Lubuntu-Nexus7 -e LXDE
 # Icon=
 Type=Application

usr/share/xsessions/lxgames.desktop

@@ -2,6 +2,6 @@
 # The names/descriptions should really be better
 Name=LX Games
 Comment=LX Games - A collection of games, using LXDE desktop.
-Exec=/usr/bin/startlubuntu-lxgames
+Exec=/usr/bin/lxsession -s LX-Games -e LXDE
 # Icon=
 Type=Application

usr/share/xsessions/qlubuntu.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Lubuntu Qt session
 Comment=A specific Lubuntu session using Qt
-Exec=/usr/bin/startlubuntu-q
+Exec=/usr/bin/lxsession -s QLubuntu -e LXDE
 # Icon=
 Type=Application