From 1977dd5081d4f305f8ff4d394ccde179f43abbeb Mon Sep 17 00:00:00 2001
From: "Bocklage, Jens" <Jens_Bocklage@mentor.com>
Date: Thu, 24 Nov 2016 14:02:04 +0100
Subject: Enable automcatic startup of Homescreen app

HomeScreen and its depending apps are started by default using systemd
user session.

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
---
 WindowManager/conf/WindowManager.service | 12 ++++++------
 WindowManager/src/windowmanager.cpp      | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'WindowManager')

diff --git a/WindowManager/conf/WindowManager.service b/WindowManager/conf/WindowManager.service
index b44e14e..ffc3602 100644
--- a/WindowManager/conf/WindowManager.service
+++ b/WindowManager/conf/WindowManager.service
@@ -1,15 +1,15 @@
 [Unit]
 Description=AGL Window Manager
-After=weston.service
+Requires=dbus.service
 
 [Service]
-Type=dbus                                
+User=root
+Type=dbus
 BusName=org.agl.windowmanager
-ExecStart=/usr/AGL/WindowManager/WindowManager
+ExecStart=/usr/AGL/HomeScreen/WindowManager
 Restart=on-failure
-RestartSec=5
-
+RestartSec=1
+StandardOutput=tty
 
 [Install]
 WantedBy=default.target
-
diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp
index 65ad5cf..a03bab6 100644
--- a/WindowManager/src/windowmanager.cpp
+++ b/WindowManager/src/windowmanager.cpp
@@ -15,8 +15,7 @@
  */
 
 #include "windowmanager.hpp"
-#include <wayland-client.h>
-#include <QFile>
+
 
 //////////////////////////////////////////
 // THIS IS STILL UNDER HEAVY DEVELOPMENT!
@@ -48,12 +47,6 @@ WindowManager::WindowManager(QObject *parent) :
     m_currentLayout(-1)
 {
     qDebug("-=[WindowManager]=-");
-    // publish windowmanager interface
-    mp_windowManagerAdaptor = new WindowmanagerAdaptor((QObject*)this);
-
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/windowmanager", this);
-    dbus.registerService("org.agl.windowmanager");
 }
 
 void WindowManager::start()
@@ -65,6 +58,11 @@ void WindowManager::start()
 
     err = ilm_init();
     qDebug("ilm_init = %d", err);
+    if(ILM_SUCCESS != err)
+    {
+        qDebug("failed! Exiting!");
+        exit(-1);
+    }
 
     myThis = this;
     err =  ilm_registerNotification(WindowManager::notificationFunc_static, this);
@@ -74,6 +72,13 @@ void WindowManager::start()
     createNewLayer(WINDOWMANAGER_LAYER_APPLICATIONS);
     createNewLayer(WINDOWMANAGER_LAYER_HOMESCREEN);
 #endif
+
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject("/windowmanager", this);
+    dbus.registerService("org.agl.windowmanager");
+
+    // publish windowmanager interface
+    mp_windowManagerAdaptor = new WindowmanagerAdaptor((QObject*)this);
 }
 
 WindowManager::~WindowManager()
-- 
cgit 1.2.3-korg