From 47a3e86b994c543ad68c0c685762ddda0ae54d80 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sun, 2 Mar 2014 23:41:46 +0100
Subject: [PATCH] Use more lxsession-default call

---
 usr/share/lubuntu/openbox/menu.xml     | 58 +++++++++++++-------------
 usr/share/lubuntu/openbox/nexus-rc.xml | 30 ++++++-------
 usr/share/lubuntu/openbox/rc.xml       |  8 ++--
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index d6ae205..9ea056d 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -5,7 +5,7 @@
 <menu id="apps-accessories-menu" label="Accessories">
   <item label="Calculator">
     <action name="Execute">
-      <command>galculator</command>
+      <command>lxsession-default calculator</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -21,15 +21,15 @@
   </item>
   <item label="File Archiver">
     <action name="Execute">
-      <command>file-roller</command>
+      <command>lxsession-default archive</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Leafpad">
+  <item label="Text Editor">
     <action name="Execute">
-      <command>leafpad</command>
+      <command>lxsession-default text_editor</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -37,7 +37,7 @@
   </item>
   <item label="Image viewer">
     <action name="Execute">
-      <command>gpicview</command>
+      <command>lxsession-default images_display</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -45,15 +45,15 @@
   </item>
   <item label="Disk utility">
     <action name="Execute">
-      <command>gnome-disks</command>
+      <command>lxsession-default disk_utility</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Xpad">
+  <item label="Notes">
     <action name="Execute">
-      <command>xpad</command>
+      <command>lxsession-default notes</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -62,25 +62,25 @@
 </menu>
 
 <menu id="apps-net-menu" label="Internet">
-  <item label="Pidgin Instant Messenger">
+  <item label="Instant Messenger">
     <action name="Execute">
-      <command>pidgin</command>
+      <command>lxsession-default im1</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Sylpheed E-mail client">
+  <item label="E-mail client">
     <action name="Execute">
-      <command>sylpheed</command>
+      <command>lxsession-default email</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Transmission torrent client">
+  <item label="Torrent client">
     <action name="Execute">
-      <command>transmission-gtk</command>
+      <command>lxsession-default bittorent</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -89,43 +89,43 @@
 </menu>
 
 <menu id="apps-office-menu" label="Office">
-  <item label="Abiword">
+  <item label="Document Editor">
     <action name="Execute">
-      <command>abiword</command>
+      <command>lxsession-default document</command>
     </action>
   </item>
-  <item label="Gnumeric">
+  <item label="Spreadsheet Editor">
     <action name="Execute">
-      <command>gnumeric</command>
+      <command>lxsession-default spreadsheet</command>
     </action>
   </item>
-  <item label="Evince">
+  <item label="PDF">
     <action name="Execute">
-      <command>evince</command>
+      <command>lxsession-default pdf_reader</command>
     </action>
   </item>
 </menu>
 
 <menu id="apps-multimedia-menu" label="Multimedia">
-  <item label="Audacious">
+  <item label="Audio player">
     <action name="Execute">
-      <command>audacious</command>
+      <command>lxsession-default video_player</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Gnome-MPlayer">
+  <item label="Video player">
     <action name="Execute">
-      <command>gnome-mplayer</command>
+      <command>lxsession-default video_player</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Xfburn">
+  <item label="Burning utility">
     <action name="Execute">
-      <command>xfburn</command>
+      <command>lxsession-default burn</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -133,7 +133,7 @@
   </item>
   <item label="Webcam">
     <action name="Execute">
-      <command>guvcview</command>
+      <command>lxsession-default webcam</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -144,7 +144,7 @@
 <menu id="system-menu" label="System">
   <item label="Desktop Settings">
     <action name="Execute">
-      <command>pcmanfm --desktop-pref</command>
+      <command>lxsession-default desktop_manager settings</command>
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
@@ -165,7 +165,7 @@
 
 <menu id="root-menu" label="Lubuntu">
   <separator label="Shortcuts" />
-  <item label="PCMan File Manager" icon="/usr/share/icons/gnome/48x48/apps/system-file-manager.png">
+  <item label="File Manager" icon="/usr/share/icons/gnome/48x48/apps/system-file-manager.png">
     <action name="Execute">
       <command>lxsession-default file_manager</command>
       <startupnotify>
diff --git a/usr/share/lubuntu/openbox/nexus-rc.xml b/usr/share/lubuntu/openbox/nexus-rc.xml
index 07cafc6..1630d71 100644
--- a/usr/share/lubuntu/openbox/nexus-rc.xml
+++ b/usr/share/lubuntu/openbox/nexus-rc.xml
@@ -364,20 +364,20 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>PCManFM</name>
+          <name>File manager</name>
         </startupnotify>
-        <command>pcmanfm</command>
+        <command>lxsession-default file_manager</command>
       </action>
     </keybind>
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxpanelctl run</command>
+        <command>lxsession-default launcher_manager</command>
       </action>
     </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 -->
@@ -398,13 +398,13 @@
     <!-- Launch task manager on Ctrl + Alt + Del-->
     <keybind key="C-A-Delete">
       <action name="Execute">
-        <command>lxtask</command>
+        <command>lxsession-default tasks</command>
       </action>
     </keybind>
     <!-- Launch a terminal on Ctrl + Alt + T-->
     <keybind key="C-A-T">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <!-- Launch a filemanager on Ctrl + Alt + D-->
@@ -412,15 +412,15 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>PCManFM</name>
+          <name>File manager</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 -->
@@ -442,24 +442,24 @@
     <!-- Keybinding for terminal button-->
     <keybind key="XF86WWW">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <keybind key="XF86Terminal">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <!-- Keybinding for calculator button-->
     <keybind key="XF86Calculator">
       <action name="Execute">
-        <command>galculator</command>
+        <command>lxsession-default calculator</command>
       </action>
     </keybind>
     <!-- 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) -->
@@ -481,13 +481,13 @@
     <!-- Launch scrot when Print is pressed -->
     <keybind key="Print">
       <action name="Execute">
-        <command>scrot</command>
+        <command>lxsession-default screenshot</command>
       </action>
     </keybind>
     <!-- Launch logout when push on the shutdown button -->
     <keybind key="XF86PowerOff">
       <action name="Execute">
-        <command>lubuntu-logout</command>
+        <command>lxsession-default quit</command>
       </action>
     </keybind>
   </keyboard>
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index 10adb30..fb2dc03 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -364,7 +364,7 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>PCManFM</name>
+          <name>File manager</name>
         </startupnotify>
         <command>lxsession-default file_manager</command>
       </action>
@@ -372,7 +372,7 @@
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxpanelctl run</command>
+        <command>lxsession-default launcher_manager</command>
       </action>
     </keybind>
     <keybind key="A-F2">
@@ -398,7 +398,7 @@
     <!-- Launch task manager on Ctrl + Alt + Del-->
     <keybind key="C-A-Delete">
       <action name="Execute">
-        <command>lxtask</command>
+        <command>lxsession-default tasks</command>
       </action>
     </keybind>
     <!-- Launch a terminal on Ctrl + Alt + T-->
@@ -453,7 +453,7 @@
     <!-- Keybinding for calculator button-->
     <keybind key="XF86Calculator">
       <action name="Execute">
-        <command>galculator</command>
+        <command>lxsession-default calculator</command>
       </action>
     </keybind>
     <!-- Keybinding for computer button-->