From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Fri, 12 May 2017 21:52:20 +0000 (+0000)
Subject: Merge "main: instantiate a afm_user_daemon proxy"
X-Git-Tag: 3.99.1~5
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=595d010bb90d8e10971e8cff389ceff7a50288b3;hp=e61042f21f8e63b63841bcaa059ef603009904db;p=apps%2Fhomescreen.git

Merge "main: instantiate a afm_user_daemon proxy"
---

diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 47d4f16..59a259e 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -27,14 +27,37 @@
 #include "statusbarmodel.h"
 #include "applicationmodel.h"
 
+#include "afm_user_daemon_proxy.h"
+
+// XXX: We want this DBus connection to be shared across the different
+// QML objects, is there another way to do this, a nice way, perhaps?
+org::AGL::afm::user *afm_user_daemon_proxy;
+
+namespace {
+
+struct Cleanup {
+    static inline void cleanup(org::AGL::afm::user *p) {
+        delete p;
+        afm_user_daemon_proxy = Q_NULLPTR;
+    }
+};
+
 void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
 {
 }
 
+}
+
 int main(int argc, char *argv[])
 {
     QGuiApplication a(argc, argv);
 
+    QScopedPointer<org::AGL::afm::user, Cleanup> afm_user_daemon_proxy(new org::AGL::afm::user("org.AGL.afm.user",
+                                                                                               "/org/AGL/afm/user",
+                                                                                               QDBusConnection::sessionBus(),
+                                                                                               0));
+    ::afm_user_daemon_proxy = afm_user_daemon_proxy.data();
+
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("HomeScreen");