From 36a76be76e2942eb59d900829c47fbc9d8a57117 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 24 Jun 2016 23:53:25 +0100
Subject: [PATCH] desktop icons

---
 src/freedombone-image-customise | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 94ad712b8..222656fe8 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1084,21 +1084,25 @@ function install_syncthing {
 }
 
 function mesh_client_startup_applications {
+	if [ ! -d $rootdir/home/$MY_USERNAME/Desktop ]; then
+		mkdir -p $rootdir/home/$MY_USERNAME/Desktop
+	fi
+
 	if [ ! -d $rootdir/home/$MY_USERNAME/.config/autostart ]; then
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
 	fi
-	echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Version=1.0' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Exec=qtox %u' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'TryExec=qtox' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Icon=qtox' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Terminal=false' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Hidden=false' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'NoDisplay=false' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'X-GNOME-Autostart-enabled=true' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Name=Tox Chat' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	echo 'Comment=Peer to peer encrypted communications' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
+
+	echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'Name=Tox Chat' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'Type=Application' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'Comment=Chat, VoIP, Video' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'TryExec=qtox' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'Exec=qtox' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'Icon=qtox' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+	echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/tox.desktop
+
+	cp $rootdir/home/$MY_USERNAME/Desktop/tox.desktop $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
+
 	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
 }
 
@@ -1107,9 +1111,6 @@ function mesh_desktop_icons {
 		mkdir -p $rootdir/home/$MY_USERNAME/Desktop
 	fi
 
-	# qTox
-	chroot "$rootdir" ln -s /home/$MY_USERNAME/.config/autostart/tox.desktop /home/$MY_USERNAME/Desktop/tox.desktop
-
 	# Terminal
 	echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 	echo 'Name=MATE Terminal' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
@@ -1117,6 +1118,7 @@ function mesh_desktop_icons {
 	echo 'Comment=Use the command line' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 	echo 'TryExec=mate-terminal' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 	echo 'Exec=mate-terminal' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
+	echo 'Icon=mate-terminal' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 	echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 
 	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop
-- 
GitLab