From 86fb8793572c9e95d3b4dc721243f5b1a1b9713c Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 25 Nov 2023 20:11:16 +0800 Subject: [PATCH] fix: Change dbus interface of deepin control center Change dbus interface of deepin control center Log: The dbus interface name was renamed to org.deepin.dde.ControlCenter1 --- .../bluetooth/private/bluetoothmanager.cpp | 9 ++++++--- .../desktop/ddplugin-wallpapersetting/wlsetplugin.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/common/dfmplugin-utils/bluetooth/private/bluetoothmanager.cpp b/src/plugins/common/dfmplugin-utils/bluetooth/private/bluetoothmanager.cpp index 321eab9467..631dc693fc 100644 --- a/src/plugins/common/dfmplugin-utils/bluetooth/private/bluetoothmanager.cpp +++ b/src/plugins/common/dfmplugin-utils/bluetooth/private/bluetoothmanager.cpp @@ -15,16 +15,19 @@ # define BluetoothService "com.deepin.daemon.Bluetooth" # define BluetoothPath "/com/deepin/daemon/Bluetooth" # define BluetoothInterface "com.deepin.daemon.Bluetooth" +# define ControlcenterService "com.deepin.dde.ControlCenter" +# define ControlcenterPath "/com/deepin/dde/ControlCenter" +# define ControlcenterInterface "com.deepin.dde.ControlCenter" #else # define BluetoothService "org.deepin.dde.Bluetooth1" # define BluetoothPath "/org/deepin/dde/Bluetooth1" # define BluetoothInterface "org.deepin.dde.Bluetooth1" +# define ControlcenterService "org.deepin.dde.ControlCenter1" +# define ControlcenterPath "org/deepin/dde/ControlCenter1" +# define ControlcenterInterface "org.deepin.dde.ControlCenter1" #endif #define BluetoothPage "bluetooth" -#define ControlcenterService "com.deepin.dde.ControlCenter" -#define ControlcenterPath "/com/deepin/dde/ControlCenter" -#define ControlcenterInterface "com.deepin.dde.ControlCenter" using namespace dfmplugin_utils; diff --git a/src/plugins/desktop/ddplugin-wallpapersetting/wlsetplugin.cpp b/src/plugins/desktop/ddplugin-wallpapersetting/wlsetplugin.cpp index a5c9aba171..33abc72eb1 100644 --- a/src/plugins/desktop/ddplugin-wallpapersetting/wlsetplugin.cpp +++ b/src/plugins/desktop/ddplugin-wallpapersetting/wlsetplugin.cpp @@ -157,8 +157,8 @@ void EventHandle::show(QString name, int mode) #else bool EventHandle::wallpaperSetting(const QString &name) { - QDBusMessage msg = QDBusMessage::createMethodCall("com.deepin.dde.ControlCenter", "/com/deepin/dde/ControlCenter", - "com.deepin.dde.ControlCenter", "ShowPage"); + QDBusMessage msg = QDBusMessage::createMethodCall("org.deepin.dde.ControlCenter1", "/org/deepin/dde/ControlCenter1", + "org.deepin.dde.ControlCenter1", "ShowPage"); msg.setArguments({QVariant::fromValue(QString("personalization")), QVariant::fromValue(QString("WallpaperSetting"))}); QDBusConnection::sessionBus().asyncCall(msg, 5); fmInfo() << "ControlCenter serivce called." << msg.service() << msg.arguments(); @@ -167,8 +167,8 @@ bool EventHandle::wallpaperSetting(const QString &name) bool EventHandle::screenSaverSetting(const QString &name) { - QDBusMessage msg = QDBusMessage::createMethodCall("com.deepin.dde.ControlCenter", "/com/deepin/dde/ControlCenter", - "com.deepin.dde.ControlCenter", "ShowPage"); + QDBusMessage msg = QDBusMessage::createMethodCall("org.deepin.dde.ControlCenter1", "/org/deepin/dde/ControlCenter1", + "org.deepin.dde.ControlCenter1", "ShowPage"); msg.setArguments({QVariant::fromValue(QString("personalization")), QVariant::fromValue(QString("ScreensaverSetting"))}); QDBusConnection::sessionBus().asyncCall(msg, 5); fmInfo() << "ControlCenter serivce called." << msg.service() << msg.arguments();