From 6da94acb83d6a26d96374b4e47415302a24daa52 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Wed, 20 Mar 2013 23:25:34 +0100
Subject: [PATCH] Use x-www-browser and x-terminal-emulator in more places.

---
 debian/changelog                                | 3 ++-
 etc/xdg/lubuntu/libfm/libfm.conf                | 2 +-
 usr/share/lubuntu/openbox/menu.xml              | 6 +++---
 usr/share/lubuntu/pcmanfm/main.lubuntu          | 2 +-
 usr/share/lxpanel/profile/Lubuntu-Nexus7/config | 2 +-
 usr/share/lxpanel/profile/Lubuntu/config        | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 781415b..0a9089b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ lubuntu-default-settings (0.32) UNRELEASED; urgency=low
 
   * usr/bin/start*
    - Remove gnome-keyring workaround, since we have the proper fix for ssh.
+  * Use x-www-browser and x-terminal-emulator in more places.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Sat, 16 Mar 2013 10:37:20 +0100
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 20 Mar 2013 23:23:40 +0100
 
 lubuntu-default-settings (0.31) raring; urgency=low
 
diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf
index 8e97586..12e46b2 100644
--- a/etc/xdg/lubuntu/libfm/libfm.conf
+++ b/etc/xdg/lubuntu/libfm/libfm.conf
@@ -2,7 +2,7 @@
 single_click=0
 use_trash=1
 confirm_del=1
-terminal=lxterminal %s
+terminal=x-terminal-emulator %s
 thumbnail_local=1
 thumbnail_max=2048
 
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 73abcc6..1aaa542 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -175,15 +175,15 @@
   </item>
   <item label="Terminal" icon="/usr/share/pixmaps/lxterminal.png">
     <action name="Execute">
-      <command>lxterminal</command>
+      <command>x-terminal-emulator</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Chromium" icon="/usr/share/icons/hicolor/48x48/apps/chromium-browser.png">
+  <item label="Internet" icon="/usr/share/icons/lubuntu/apps/48/apps/web-browser.svg">
     <action name="Execute">
-      <command>chromium-browser</command>
+      <command>x-www-browser</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
diff --git a/usr/share/lubuntu/pcmanfm/main.lubuntu b/usr/share/lubuntu/pcmanfm/main.lubuntu
index f6a75e7..71e3b0d 100644
--- a/usr/share/lubuntu/pcmanfm/main.lubuntu
+++ b/usr/share/lubuntu/pcmanfm/main.lubuntu
@@ -1,5 +1,5 @@
 [General]
-terminal=lxterminal
+terminal=x-terminal-emulator
 
 [Desktop]
 show_wallpaper=1
diff --git a/usr/share/lxpanel/profile/Lubuntu-Nexus7/config b/usr/share/lxpanel/profile/Lubuntu-Nexus7/config
index 35ece0c..239cedf 100644
--- a/usr/share/lxpanel/profile/Lubuntu-Nexus7/config
+++ b/usr/share/lxpanel/profile/Lubuntu-Nexus7/config
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=lxterminal -e
+Terminal=x-terminal-emulator -e
 Logout=lubuntu-logout
diff --git a/usr/share/lxpanel/profile/Lubuntu/config b/usr/share/lxpanel/profile/Lubuntu/config
index 35ece0c..239cedf 100644
--- a/usr/share/lxpanel/profile/Lubuntu/config
+++ b/usr/share/lxpanel/profile/Lubuntu/config
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=lxterminal -e
+Terminal=x-terminal-emulator -e
 Logout=lubuntu-logout