summaryrefslogtreecommitdiff
path: root/telepathy-glib/simple-client-factory.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-08-04 15:10:45 +0200
committerXavier Claessens <xclaesse@gmail.com>2011-08-04 15:10:45 +0200
commite4677ed33842a2deeffd5e119833c74571485d0e (patch)
tree512774e1b3bf8d9c0926fffb48c62250501d8d55 /telepathy-glib/simple-client-factory.c
parent24d358dfc94c8872e2931e1290e7de94cd6e4f3c (diff)
downloadtelepathy-glib-e4677ed33842a2deeffd5e119833c74571485d0e.tar.gz
Add TP_CONTACT_FEATURE_INVALID because 0 is a valid TpContactFeature
Diffstat (limited to 'telepathy-glib/simple-client-factory.c')
-rw-r--r--telepathy-glib/simple-client-factory.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/telepathy-glib/simple-client-factory.c b/telepathy-glib/simple-client-factory.c
index 1af62a95d..01c3e6615 100644
--- a/telepathy-glib/simple-client-factory.c
+++ b/telepathy-glib/simple-client-factory.c
@@ -1037,7 +1037,8 @@ tp_simple_client_factory_add_contact_features (TpSimpleClientFactory *self,
* tp_simple_client_factory_add_contact_features_varargs: (skip)
* @self: a #TpSimpleClientFactory
* @feature: the first feature
- * @...: the second and subsequent features, if any, ending with 0
+ * @...: the second and subsequent features, if any, ending with
+ * %TP_CONTACT_FEATURE_INVALID
*
* The same as tp_simple_client_factory_add_contact_features(), but with a
* more convenient calling convention from C.
@@ -1052,14 +1053,15 @@ tp_simple_client_factory_add_contact_features_varargs (
{
va_list var_args;
GArray *features;
- GQuark f;
+ TpContactFeature f;
g_return_if_fail (TP_IS_SIMPLE_CLIENT_FACTORY (self));
va_start (var_args, feature);
features = g_array_new (FALSE, FALSE, sizeof (TpContactFeature));
- for (f = feature; f != 0; f = va_arg (var_args, TpContactFeature))
+ for (f = feature; f != TP_CONTACT_FEATURE_INVALID;
+ f = va_arg (var_args, TpContactFeature))
g_array_append_val (features, f);
tp_simple_client_factory_add_contact_features (self, features->len,