summaryrefslogtreecommitdiff
path: root/dbus-gmain/tests/30574.c
diff options
context:
space:
mode:
Diffstat (limited to 'dbus-gmain/tests/30574.c')
-rw-r--r--dbus-gmain/tests/30574.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/dbus-gmain/tests/30574.c b/dbus-gmain/tests/30574.c
index ef66df2..ca7b79f 100644
--- a/dbus-gmain/tests/30574.c
+++ b/dbus-gmain/tests/30574.c
@@ -46,7 +46,7 @@ set_reply (DBusPendingCall * pending, void *user_data)
SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
closure->reply = dbus_pending_call_steal_reply (pending);
- dbus_gmain_set_up_connection (bus, NULL);
+ DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
g_main_loop_quit (closure->loop);
}
@@ -59,17 +59,18 @@ send_and_allow_reentry (DBusConnection * bus, DBusMessage * message,
SpiReentrantCallClosure closure;
closure.loop = g_main_loop_new (main_context, FALSE);
- dbus_gmain_set_up_connection (bus, (switch_after_send ? NULL :
- main_context));
+ DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus,
+ (switch_after_send ? NULL :
+ main_context));
if (!dbus_connection_send_with_reply (bus, message, &pending, 3000))
{
- dbus_gmain_set_up_connection (bus, NULL);
+ DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
return NULL;
}
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
if (switch_after_send)
- dbus_gmain_set_up_connection (bus, main_context);
+ DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, main_context);
g_main_loop_run (closure.loop);
g_main_loop_unref (closure.loop);
@@ -123,7 +124,7 @@ main(int argc, const char *argv[])
fprintf(stderr, "Couldn't connect to bus: %s\n", error.name);
return 1;
}
- dbus_gmain_set_up_connection (bus, NULL);
+ DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
send_test_message (FALSE);
send_test_message (FALSE);
send_test_message (TRUE);