Get DBus to work

Eeems-Org · Jan 17, 2024 · 92c576c · 92c576c
1 parent b325793
commit 92c576c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/applications/display-server/dbusinterface.cpp b/applications/display-server/dbusinterface.cpp
@@ -5,7 +5,10 @@
 #include <unistd.h>
 #include <liboxide/debug.h>
 
-DbusInterface::DbusInterface(QObject* parent) : QObject(parent) {}
+DbusInterface::DbusInterface(QObject* parent) : QObject(parent){
+    // Needed to trick QtDBus into exposing the object
+    setProperty("__init__", true);
+}
 
 void DbusInterface::registerService(){
 #ifdef EPAPER
@@ -17,31 +20,24 @@ void DbusInterface::registerService(){
         qFatal("Failed to connect to system bus.");
     }
     QDBusConnectionInterface* interface = bus.interface();
-    auto reply = interface->registerService(BLIGHT_SERVICE);
-    bus.registerService(BLIGHT_SERVICE);
-    if(!reply.isValid()){
-        QDBusError ex = reply.error();
-        qFatal("Unable to register service: %s", ex.message().toStdString().c_str());
-    }
     if(!bus.registerObject("/", this, QDBusConnection::ExportAllContents)){
         qFatal("Unable to register interface: %s", bus.lastError().message().toStdString().c_str());
     }
     if(!bus.objectRegisteredAt("/")){
         qFatal("Object not appearing!");
     }
-    if(!bus.registerObject(BLIGHT_SERVICE_PATH, this, QDBusConnection::ExportAllContents)){
-        qFatal("Unable to register interface: %s", bus.lastError().message().toStdString().c_str());
-    }
-    if(!bus.objectRegisteredAt(BLIGHT_SERVICE_PATH)){
-        qFatal("Object not appearing!");
+    auto reply = interface->registerService(BLIGHT_SERVICE);
+    bus.registerService(BLIGHT_SERVICE);
+    if(!reply.isValid()){
+        QDBusError ex = reply.error();
+        qFatal("Unable to register service: %s", ex.message().toStdString().c_str());
     }
-    O_DEBUG("Object registered to " BLIGHT_SERVICE_PATH);
     connect(
         interface,
         &QDBusConnectionInterface::serviceOwnerChanged,
         this,
         &DbusInterface::serviceOwnerChanged
-        );
+    );
     O_DEBUG("Connected service to bus");
 }
 

diff --git a/applications/display-server/dbusinterface.h b/applications/display-server/dbusinterface.h
@@ -10,7 +10,7 @@
 
 #include "../../shared/liboxide/meta.h"
 
-class DbusInterface : public QObject, public QDBusContext {
+class DbusInterface : public QObject, protected QDBusContext {
     Q_OBJECT
     Q_CLASSINFO("Version", OXIDE_INTERFACE_VERSION)
     Q_CLASSINFO("D-Bus Interface", BLIGHT_INTERFACE)

diff --git a/applications/display-server/main.cpp b/applications/display-server/main.cpp
@@ -148,6 +148,7 @@ int main(int argc, char* argv[]){
     if(engine.rootObjects().isEmpty()){
         qFatal("Failed to load main layout");
     }
-    DbusInterface(qApp).registerService();
+    DbusInterface interface(qApp);
+    interface.registerService();
     return app.exec();
 }
diff --git a/applications/test/main.cpp b/applications/test/main.cpp
@@ -49,9 +49,6 @@ int main(int argc, char *argv[]){
         if(res.isError()){
             qFatal("Failed to get connection: %s", res.error().message().toStdString().c_str());
         }
-        if(!res.isValid()){
-            qFatal("Failed to get connection: Invalid DBus response");
-        }
         auto qfd = res.value();
         if(!qfd.isValid()){
             qFatal("Failed to get connection: Invalid file descriptor");

diff --git a/shared/liboxide/meta.h b/shared/liboxide/meta.h
@@ -98,6 +98,5 @@
 #define OXIDE_SCREENSHOT_INTERFACE OXIDE_SERVICE ".Screenshot"
 
 #define BLIGHT_SERVICE "codes.eeems.blight1"
-#define BLIGHT_SERVICE_PATH "/codes/eeems/blight1"
 #define BLIGHT_INTERFACE BLIGHT_SERVICE ".Compositor"
 /*! @} */