summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-19 12:23:52 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-31 17:12:30 +0100
commitdd3f97cc9ae7f2770f10164f1ad2c8d4a3a04123 (patch)
treeab6dffe50bd364c2c4246425cf0e99a5ef4c4924
parent726e4173951c47757adaaf97368af862bdd3e2e8 (diff)
ExampleContactList: implement block_contacts_with_abuse_async
That doesn't change much for existing tests but will be handy to test the client side part of this property. https://bugs.freedesktop.org/show_bug.cgi?id=41801
-rw-r--r--examples/cm/contactlist/contact-list.c9
-rw-r--r--tests/dbus/contact-lists.c3
2 files changed, 8 insertions, 4 deletions
diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c
index fec9afe7..a42ce350 100644
--- a/examples/cm/contactlist/contact-list.c
+++ b/examples/cm/contactlist/contact-list.c
@@ -1458,8 +1458,10 @@ example_contact_list_dup_blocked_contacts (TpBaseContactList *contact_list)
}
static void
-example_contact_list_block_contacts_async (TpBaseContactList *contact_list,
+example_contact_list_block_contacts_with_abuse_async (
+ TpBaseContactList *contact_list,
TpHandleSet *contacts,
+ gboolean report_abusive,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -1484,7 +1486,7 @@ example_contact_list_block_contacts_async (TpBaseContactList *contact_list,
tp_base_contact_list_contact_blocking_changed (contact_list, changed);
tp_handle_set_destroy (changed);
tp_simple_async_report_success_in_idle ((GObject *) self, callback,
- user_data, example_contact_list_block_contacts_async);
+ user_data, example_contact_list_block_contacts_with_abuse_async);
}
static void
@@ -1701,7 +1703,8 @@ blockable_contact_list_iface_init (TpBlockableContactListInterface *iface)
{
iface->can_block = tp_base_contact_list_true_func;
iface->dup_blocked_contacts = example_contact_list_dup_blocked_contacts;
- iface->block_contacts_async = example_contact_list_block_contacts_async;
+ iface->block_contacts_with_abuse_async =
+ example_contact_list_block_contacts_with_abuse_async;
iface->unblock_contacts_async = example_contact_list_unblock_contacts_async;
}
diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c
index 3cedb2fd..2a975307 100644
--- a/tests/dbus/contact-lists.c
+++ b/tests/dbus/contact-lists.c
@@ -811,7 +811,8 @@ test_properties (Test *test,
blocking_caps = tp_asv_get_uint32 (asv, "ContactBlockingCapabilities",
&valid);
g_assert (valid);
- g_assert_cmpuint (blocking_caps, ==, 0);
+ g_assert_cmpuint (blocking_caps, ==,
+ TP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE);
g_hash_table_unref (asv);
g_assert_cmpuint (test->log->len, ==, 0);