From f92aeedd7f20ae0f53014ab6318a7753747dd517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Fri, 27 Nov 2015 20:41:13 +0100
Subject: [PATCH] User login: Fixed missing Deskbar tray icons.

* The mail_daemon could have been launched too early, which caused it
  not to be able to add its Deskbar icon. We don't really want a
  dependency to the Deskbar, though, which is why we only run the
  mail_daemon on the same event (which makes the Deskbar available
  at that point).
* Ideally, the mail_daemon should be smart enough to install its Deskbar
  icon once the Deskbar is available, though.
* Similar issue for the first login scripts. Here, we have a real
  dependency to the Deskbar which makes the script launch once the
  Deskbar is available.
* This finally fixes #12454.
---
 data/launch/user | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/data/launch/user b/data/launch/user
index 902c460695..e98bd6fcee 100644
--- a/data/launch/user
+++ b/data/launch/user
@@ -4,21 +4,18 @@ target desktop {
 	service x-vnd.Be-TRAK {
 		launch /system/Tracker
 		legacy
-		on {
-			initial_volumes_mounted
-		}
+		on initial_volumes_mounted
 	}
 
 	service x-vnd.Be-TSKB {
 		launch /system/Deskbar
-		on {
-			initial_volumes_mounted
-		}
+		on initial_volumes_mounted
 	}
 
 	service x-vnd.Be-POST {
-		launch /system/servers/mail_daemon -E
+		launch /system/servers/mail_daemon
 		if setting ~/config/settings/Mail/new_mail_daemon DaemonAutoStarts
+		on initial_volumes_mounted
 		no_safemode
 		legacy
 	}
@@ -38,6 +35,7 @@ target desktop {
 	job first-login {
 		launch /bin/sh /system/boot/PostInstallScript "first login" ~/config/settings/first_login /boot/system/boot/first-login
 		if file_exists ~/config/settings/first_login
+		requires x-vnd.Be-TSKB
 	}
 
 	job create-installer-link {