diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2012-10-01 09:42:36 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-10-03 09:10:43 -0500 |
| commit | d98a8216421ce3db651f78d16f8c48049416e6b9 (patch) | |
| tree | dc18f6764e8d5b2da2612d8d3bd3f2aec06f37cd /tools | |
| parent | 732f598ad10616cd92fefe50c8270396c03ecc1c (diff) | |
| download | ofono-d98a8216421ce3db651f78d16f8c48049416e6b9.tar.bz2 | |
stktest: Track pending inside the agent
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/stktest.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/stktest.c b/tools/stktest.c index 35314d94..1aa03061 100644 --- a/tools/stktest.c +++ b/tools/stktest.c @@ -218,6 +218,7 @@ static DBusMessage *agent_display_text(DBusConnection *conn, DBusMessage *msg, dbus_bool_t urgent; struct test *test; display_text_cb_t func; + DBusMessage *reply; if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &text, DBUS_TYPE_BYTE, &icon_id, @@ -243,7 +244,11 @@ static DBusMessage *agent_display_text(DBusConnection *conn, DBusMessage *msg, return stktest_error_failed(msg); } - return func(msg, text, icon_id, urgent); + reply = func(msg, text, icon_id, urgent); + if (reply == NULL) + pending = dbus_message_ref(msg); + + return reply; } static void server_debug(const char *str, void *data) @@ -997,8 +1002,6 @@ static DBusMessage *test_display_text_15(DBusMessage *msg, STKTEST_AGENT_ASSERT(icon_id == 0); STKTEST_AGENT_ASSERT(urgent == FALSE); - pending = dbus_message_ref(msg); - return NULL; } @@ -1054,8 +1057,6 @@ static DBusMessage *test_display_text_21(DBusMessage *msg, STKTEST_AGENT_ASSERT(icon_id == 0); STKTEST_AGENT_ASSERT(urgent == FALSE); - pending = dbus_message_ref(msg); - return NULL; } |