From d01a2dc1a7f1db20d806b19e3a1c956e390fa26e Mon Sep 17 00:00:00 2001 From: Unsung Lee Date: Tue, 19 Oct 2021 14:26:02 +0900 Subject: [PATCH] Modify dbus object path Change-Id: I6377613b93197d45e7873004767a22ddbedb68a1 Signed-off-by: Unsung Lee --- src/libgdbus/dbus-iface-system.h | 3 ++- src/libgdbus/libgdbus.c | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libgdbus/dbus-iface-system.h b/src/libgdbus/dbus-iface-system.h index e65384a..8b8c27b 100644 --- a/src/libgdbus/dbus-iface-system.h +++ b/src/libgdbus/dbus-iface-system.h @@ -39,6 +39,7 @@ #define DBUS_BUS_NAME "org.freedesktop.DBus" #define DBUS_OBJECT_PATH "/org/freedesktop/DBus" #define DBUS_INTERFACE_NAME DBUS_BUS_NAME +#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" /******************************************************************************* * @@ -338,4 +339,4 @@ /***********************************************/ -#endif \ No newline at end of file +#endif diff --git a/src/libgdbus/libgdbus.c b/src/libgdbus/libgdbus.c index 9295582..9eaa937 100644 --- a/src/libgdbus/libgdbus.c +++ b/src/libgdbus/libgdbus.c @@ -525,9 +525,9 @@ char **gdbus_get_owner_list(dbus_handle_h handle, const char *bus_name) } reply = g_dbus_connection_call_sync(dh->conn, - "org.freedesktop.DBus", - "/", - "org.freedesktop.DBus", + DBUS_BUS_NAME, + DBUS_OBJECT_PATH, + DBUS_INTERFACE_NAME, "ListQueuedOwners", g_variant_new("(s)", bus_name), NULL, @@ -2603,7 +2603,8 @@ int gdbus_connection_get_sender_pid(GDBusConnection *conn, const char * sender) } reply = g_dbus_connection_call_sync(conn, - "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "GetConnectionUnixProcessID", + DBUS_BUS_NAME, DBUS_OBJECT_PATH, DBUS_INTERFACE_NAME, + "GetConnectionUnixProcessID", g_variant_new("(s)", sender), NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_REPLY_TIMEOUT, @@ -2813,7 +2814,7 @@ int check_systemd_active(void) ret = gdbus_call_sync_with_reply("org.freedesktop.systemd1", "/org/freedesktop/systemd1/unit/default_2etarget", - "org.freedesktop.DBus.Properties", + DBUS_INTERFACE_PROPERTIES, "Get", g_variant_new("(ss)", "org.freedesktop.systemd1.Unit", "ActiveState"), &reply); -- 2.7.4