From a27c11d09f0e9a7e123fb09a8d785646d1ad3fc8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 30 Jul 2016 17:43:29 +0100
Subject: [PATCH] Fix mesh desktop icons

---
 src/freedombone-image-mesh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 51658861..3c9688bc 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -31,6 +31,9 @@ PROJECT_NAME='freedombone'
 export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
 export TEXTDOMAINDIR="/usr/share/locale"
 
+# The browser application to use
+BROWSER=iceweasel
+
 MY_USERNAME='fbone'
 PEER_ID=
 INSTALL_DIR=/root/build
@@ -472,13 +475,12 @@ function create_tox_user {
 	echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
 	echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
 	echo 'Comment=Chat, VoIP, Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'TryExec=qtox -p data' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'Exec=qtox -p data' >> /home/$MY_USERNAME/Desktop/tox.desktop
+	echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
 	echo 'Icon=qtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
 	echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
 
-	chown ${MY_DESKTOP}:${MY_DESKTOP} /home/$MY_USERNAME/Desktop/*
 	chmod +x /home/$MY_USERNAME/Desktop/*
+	chown ${MY_DESKTOP}:${MY_DESKTOP} /home/$MY_USERNAME/Desktop/*
 }
 
 function show_desktop_icons {
@@ -505,10 +507,8 @@ function show_desktop_icons {
 	echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
 	echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
 
-	chown ${MY_DESKTOP}:${MY_DESKTOP} /home/$MY_USERNAME/Desktop/*
 	chmod +x /home/$MY_USERNAME/Desktop/*
-
-	pkill caja
+	chown ${MY_DESKTOP}:${MY_DESKTOP} /home/$MY_USERNAME/Desktop/*
 }
 
 function disable_password_logins {