From 2592a2abb26683bf0a2ec23b6aa19dc7bafa5878 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Mon, 14 Aug 2006 18:12:20 +0000 Subject: * dbus/dbus-bus.c: * test/name-test/test-names.c: Remove test method dbus_bus_connection_get_unique_name because we already have public method dbus_bus_get_unique_name that does the exact same thing --- ChangeLog | 8 ++++++++ dbus/dbus-bus.c | 12 ------------ test/name-test/test-names.c | 18 ++++++++---------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55275069..1bba3cb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-14 John (J5) Palmieri + + * dbus/dbus-bus.c: + * test/name-test/test-names.c: + Remove test method dbus_bus_connection_get_unique_name because + we already have public method dbus_bus_get_unique_name that + does the exact same thing + 2006-08-10 John (J5) Palmieri * dbus/dbus-signature.c: diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index e4966a41..eae46051 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -1156,16 +1156,4 @@ dbus_bus_remove_match (DBusConnection *connection, dbus_message_unref (msg); } -#ifdef DBUS_BUILD_TESTS -const char * -dbus_bus_connection_get_unique_name (DBusConnection *connection) -{ - BusData *bd; - bd = dbus_connection_get_data (connection, bus_data_slot); - - return bd->unique_name; -} -#endif /* DBUS_BUILD_TESTS */ - - /** @} */ diff --git a/test/name-test/test-names.c b/test/name-test/test-names.c index 3db2a8cc..3cf7047b 100644 --- a/test/name-test/test-names.c +++ b/test/name-test/test-names.c @@ -24,8 +24,6 @@ #define TEST_NAME "org.freedesktop.DBus.TestSuite.NameTest" #define NUM_TRIES_TIL_FAIL 15 -extern const char *dbus_bus_connection_get_unique_name (DBusConnection *connection); - typedef struct { int command; @@ -162,7 +160,7 @@ check_connection (DBusConnection *conn, } expected_uname = - dbus_bus_connection_get_unique_name (uniq_conn[expected_conn_num]); + dbus_bus_get_unique_name (uniq_conn[expected_conn_num]); if (strcmp (list[i], expected_uname) != 0) { @@ -385,10 +383,10 @@ check_signals (DBusConnection *monitor, } lost_name = lost_conn == NULL? NULL : - dbus_bus_connection_get_unique_name (lost_conn); + dbus_bus_get_unique_name (lost_conn); acquired_name = acquired_conn == NULL? NULL : - dbus_bus_connection_get_unique_name (acquired_conn); + dbus_bus_get_unique_name (acquired_conn); if (lost_name != NULL) if (!match_acquired_or_lost_signal (lost_conn, @@ -436,7 +434,7 @@ main (int argc, char *argv[]) if (!match_acquired_or_lost_signal (conn[0], "NameAcquired", - dbus_bus_connection_get_unique_name (conn[0]))) + dbus_bus_get_unique_name (conn[0]))) return 1; conn[1] = dbus_bus_get_private (DBUS_BUS_SESSION, &error); @@ -450,7 +448,7 @@ main (int argc, char *argv[]) if (!match_acquired_or_lost_signal (conn[1], "NameAcquired", - dbus_bus_connection_get_unique_name (conn[1]))) + dbus_bus_get_unique_name (conn[1]))) return 1; @@ -465,7 +463,7 @@ main (int argc, char *argv[]) if (!match_acquired_or_lost_signal (conn[2], "NameAcquired", - dbus_bus_connection_get_unique_name (conn[2]))) + dbus_bus_get_unique_name (conn[2]))) return 1; @@ -480,7 +478,7 @@ main (int argc, char *argv[]) if (!match_acquired_or_lost_signal (conn[3], "NameAcquired", - dbus_bus_connection_get_unique_name (conn[3]))) + dbus_bus_get_unique_name (conn[3]))) return 1; @@ -495,7 +493,7 @@ main (int argc, char *argv[]) if (!match_acquired_or_lost_signal (monitor, "NameAcquired", - dbus_bus_connection_get_unique_name (monitor))) + dbus_bus_get_unique_name (monitor))) return 1; dbus_bus_add_match (monitor, "", &error); -- cgit