diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-08 10:16:14 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-08 10:16:14 +0100 |
| commit | dc89b31af5497a7c0c78d04d89ffe350715e8692 (patch) | |
| tree | 7aacf5dc76587703c05ff69adcc5a28467e86ff4 | |
| parent | 7e9e54e35a6f0b09de5467c385f018dbb0a3ef11 (diff) | |
| download | telepathy-logger-dc89b31af5497a7c0c78d04d89ffe350715e8692.tar.gz | |
all: TpContact features are now GQuarks, not enum members
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | telepathy-logger/observer.c | 2 | ||||
| -rw-r--r-- | tests/dbus/test-entity.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c index 974f4c3..3958420 100644 --- a/telepathy-logger/observer.c +++ b/telepathy-logger/observer.c @@ -296,7 +296,7 @@ _tpl_observer_dup (GError **error) TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_PRESENCE, TP_CONTACT_FEATURE_AVATAR_TOKEN, - TP_CONTACT_FEATURE_INVALID); + 0); observer_singleton = g_object_new (TPL_TYPE_OBSERVER, "factory", factory, diff --git a/tests/dbus/test-entity.c b/tests/dbus/test-entity.c index 50dd2b6..7bf2eca 100644 --- a/tests/dbus/test-entity.c +++ b/tests/dbus/test-entity.c @@ -88,8 +88,8 @@ test_entity_instantiation_from_tp_contact (void) TpHandle handles[2]; const char *alias[] = {"Alice in Wonderland", "Bob the builder"}; const char *avatar_tokens[] = {"alice-token", NULL}; - TpContactFeature features[] = - { TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_AVATAR_TOKEN }; + GQuark features[] = + { TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_AVATAR_TOKEN, 0 }; Result result; TplEntity *entity; |