From ce3910c2fe850a56d0e4a37dff6928c085fddf91 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Wed, 19 Feb 2014 22:51:10 +0100
Subject: [PATCH] * usr/share/lubuntu/openbox/*.xml  - Use more
 lxsession-default when it's possible.

---
 debian/changelog                   |  2 ++
 usr/share/lubuntu/openbox/menu.xml |  4 ++--
 usr/share/lubuntu/openbox/rc.xml   | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87d3040..249c6ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ lubuntu-default-settings (0.37~ppa1) trusty; urgency=low
    - Create lubuntu-extra-sessions to isolate experimental sessions.
   * debian/lubuntu-default-settings & debian/lubuntu-extra-sessions
    - Move files of the extra sessions.
+  * usr/share/lubuntu/openbox/*.xml
+   - Use more lxsession-default when it's possible.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Tue, 18 Feb 2014 22:42:30 +0100
 
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 2da9dac..d6ae205 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -167,7 +167,7 @@
   <separator label="Shortcuts" />
   <item label="PCMan File Manager" icon="/usr/share/icons/gnome/48x48/apps/system-file-manager.png">
     <action name="Execute">
-      <command>lxsession-default filemanager</command>
+      <command>lxsession-default file_manager</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -183,7 +183,7 @@
   </item>
   <item label="Internet" icon="/usr/share/icons/lubuntu/apps/48/apps/web-browser.svg">
     <action name="Execute">
-      <command>x-www-browser</command>
+      <command>lxsession-default webbrowser</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index 4b5e7f6..10adb30 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -366,7 +366,7 @@
           <enabled>true</enabled>
           <name>PCManFM</name>
         </startupnotify>
-        <command>pcmanfm</command>
+        <command>lxsession-default file_manager</command>
       </action>
     </keybind>
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
@@ -377,7 +377,7 @@
     </keybind>
     <keybind key="A-F2">
       <action name="Execute">
-        <command>lxpanelctl run</command>
+        <command>lxsession-default launcher_manager</command>
       </action>
     </keybind>
     <!-- Keybindings for running Menu from Lxpanel -->
@@ -414,13 +414,13 @@
           <enabled>true</enabled>
           <name>PCManFM</name>
         </startupnotify>
-        <command>pcmanfm</command>
+        <command>lxsession-default file_manager</command>
       </action>
     </keybind>
     <!-- Lock the screen on Ctrl + Alt + l-->
     <keybind key="C-A-l">
       <action name="Execute">
-        <command>xscreensaver-command -lock</command>
+        <command>lxsession-default lock</command>
       </action>
     </keybind>
     <!-- Keybinding for Volume management -->
@@ -459,7 +459,7 @@
     <!-- Keybinding for computer button-->
     <keybind key="XF86MyComputer">
       <action name="Execute">
-        <command>pcmanfm</command>
+        <command>lxsession-default file_manager</command>
       </action>
     </keybind>
     <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed) -->