This reverts commit 237d818ef294e22be87fba69b3cdd79c75c201e7, which encouraged the use of private DBus connections. Doing so caused a bug, so it's better to remove the temptation for now and re-add it if a legitimate use case is ever found. Signed-off-by: Andrew Sayers <kernel.org@xxxxxxxxxxxxxxx> --- obexd/src/main.c | 8 -------- obexd/src/obexd.h | 2 -- 2 files changed, 10 deletions(-) diff --git a/obexd/src/main.c b/obexd/src/main.c index df150973e..6837f0d73 100644 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -254,14 +254,6 @@ DBusConnection *obex_setup_dbus_connection(const char *name, return connection; } -DBusConnection *obex_setup_dbus_connection_private(const char *name, - DBusError *error) -{ - return g_dbus_setup_private(option_system_bus ? - DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, - name, error); -} - int main(int argc, char *argv[]) { GOptionContext *context; diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h index 560db29ce..5e5edc4de 100644 --- a/obexd/src/obexd.h +++ b/obexd/src/obexd.h @@ -33,5 +33,3 @@ const char *obex_option_capability(void); DBusConnection *obex_get_dbus_connection(void); DBusConnection *obex_setup_dbus_connection(const char *name, DBusError *error); -DBusConnection *obex_setup_dbus_connection_private(const char *name, - DBusError *error); -- 2.49.0