diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-08 13:09:36 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-08 13:09:36 +0100 |
commit | 37b729e813c983dbb7f238e46a56ab02220e548b (patch) | |
tree | 26cd23848efe5d74b05036fbe584d1671fe65309 | |
parent | 54909069028abd3f91b9fd9d495cea45ce68ef89 (diff) |
Telepathy test utilities: sync with telepathy-glib next-gvariant1 branch
Cosmetic changes only.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77139
-rw-r--r-- | tests/lib/telepathy/contactlist/util.c | 6 | ||||
-rw-r--r-- | tests/lib/telepathy/contactlist/util.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/telepathy/contactlist/util.c b/tests/lib/telepathy/contactlist/util.c index a0d2ee4c..1acf1225 100644 --- a/tests/lib/telepathy/contactlist/util.c +++ b/tests/lib/telepathy/contactlist/util.c @@ -663,7 +663,7 @@ TpChannel * tp_tests_channel_new (TpConnection *conn, const gchar *object_path, const gchar *optional_channel_type, - TpEntityType optional_handle_type, + TpEntityType optional_entity_type, TpHandle optional_handle, GError **error) { @@ -677,10 +677,10 @@ tp_tests_channel_new (TpConnection *conn, tp_asv_set_string (asv, TP_PROP_CHANNEL_CHANNEL_TYPE, optional_channel_type); } - if (optional_handle_type != TP_ENTITY_TYPE_NONE) + if (optional_entity_type != TP_ENTITY_TYPE_NONE) { tp_asv_set_uint32 (asv, - TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, optional_handle_type); + TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, optional_entity_type); } if (optional_handle != 0) { diff --git a/tests/lib/telepathy/contactlist/util.h b/tests/lib/telepathy/contactlist/util.h index d523e703..725a59e6 100644 --- a/tests/lib/telepathy/contactlist/util.h +++ b/tests/lib/telepathy/contactlist/util.h @@ -97,7 +97,7 @@ TpAccount *tp_tests_account_new (GDBusConnection *dbus, TpChannel *tp_tests_channel_new (TpConnection *conn, const gchar *object_path, const gchar *optional_channel_type, - TpEntityType optional_handle_type, + TpEntityType optional_entity_type, TpHandle optional_handle, GError **error); |