From ecf133739d8a4e19e3c20102a59b70ff85e0b153 Mon Sep 17 00:00:00 2001 From: ECQZXC Date: Thu, 6 Mar 2025 16:50:22 +0800 Subject: [PATCH] =?UTF-8?q?fit:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=BA=E6=9C=89=E6=91=84=E5=83=8F=E5=A4=B4,=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=96=B9=E5=BC=8F=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=94=9F=E7=89=A9=E8=AE=A4=E8=AF=81=E5=85=A5=E5=8F=A3=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 需要先注册object,再注册名称 pms: BUG-306287 --- main.cpp | 14 +++++++++++--- msic/dbus-services/org.deepin.dde.Face1.service | 3 +-- msic/systemd/deepin-face.service | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/main.cpp b/main.cpp index 1495bb1..b81e251 100644 --- a/main.cpp +++ b/main.cpp @@ -20,14 +20,22 @@ int main(int argc, char *argv[]) DbusFaceService w; QDBusConnection connection = QDBusConnection::systemBus(); - if (!connection.registerService(SERVERNAME) - || !connection.registerObject(SERVERPATH, + if ( !connection.registerObject(SERVERPATH, &w, QDBusConnection::ExportAllSlots | QDBusConnection::ExportScriptableProperties | QDBusConnection::ExportAllSignals)) { - qDebug() << "dbus service already registered!"; + qWarning() << "dbus object registere error!"; return -1; } + + auto reply = connection.registerService(SERVERNAME); + if (reply != QDBusConnectionInterface::ServiceRegistered) + { + qWarning() << "dbus service registere error!"; + /* code */ + return -1; + } + return a.exec(); } diff --git a/msic/dbus-services/org.deepin.dde.Face1.service b/msic/dbus-services/org.deepin.dde.Face1.service index 05e08b5..5ca7b26 100644 --- a/msic/dbus-services/org.deepin.dde.Face1.service +++ b/msic/dbus-services/org.deepin.dde.Face1.service @@ -1,5 +1,4 @@ [D-BUS Service] Name=org.deepin.dde.Face1 -User=root -Exec=/usr/libexec/deepin-face +Exec=/bin/false SystemdService=deepin-face.service diff --git a/msic/systemd/deepin-face.service b/msic/systemd/deepin-face.service index 8b7f4a5..d7f388d 100644 --- a/msic/systemd/deepin-face.service +++ b/msic/systemd/deepin-face.service @@ -9,7 +9,7 @@ After=dbus.socket Type=dbus User=deepin-daemon SupplementaryGroups=video -BusName=com.deepin.face +BusName=org.deepin.dde.Face1 ExecStart=/usr/libexec/deepin-face ProtectSystem=strict