* 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-14 John (J5) Palmieri <johnp@redhat.com>
+
+ * 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 <johnp@redhat.com>
* dbus/dbus-signature.c:
2006-08-10 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-signature.c:
dbus_message_unref (msg);
}
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 */
-
-
#define TEST_NAME "org.freedesktop.DBus.TestSuite.NameTest"
#define NUM_TRIES_TIL_FAIL 15
#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;
typedef struct {
int command;
- 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)
{
if (strcmp (list[i], expected_uname) != 0)
{
}
lost_name = lost_conn == NULL? NULL :
}
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 :
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,
if (lost_name != NULL)
if (!match_acquired_or_lost_signal (lost_conn,
if (!match_acquired_or_lost_signal (conn[0],
"NameAcquired",
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);
return 1;
conn[1] = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
if (!match_acquired_or_lost_signal (conn[1],
"NameAcquired",
if (!match_acquired_or_lost_signal (conn[1],
"NameAcquired",
- dbus_bus_connection_get_unique_name (conn[1])))
+ dbus_bus_get_unique_name (conn[1])))
if (!match_acquired_or_lost_signal (conn[2],
"NameAcquired",
if (!match_acquired_or_lost_signal (conn[2],
"NameAcquired",
- dbus_bus_connection_get_unique_name (conn[2])))
+ dbus_bus_get_unique_name (conn[2])))
if (!match_acquired_or_lost_signal (conn[3],
"NameAcquired",
if (!match_acquired_or_lost_signal (conn[3],
"NameAcquired",
- dbus_bus_connection_get_unique_name (conn[3])))
+ dbus_bus_get_unique_name (conn[3])))
if (!match_acquired_or_lost_signal (monitor,
"NameAcquired",
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);
return 1;
dbus_bus_add_match (monitor, "", &error);