diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-16 16:20:09 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-16 16:20:09 +0100 |
| commit | 2a4da279d880b50c5dbf6f55116d1a0087ef4d71 (patch) | |
| tree | da90a205871a3b7dc50b56a864fc1370f2d0bffb /src/protocol.c | |
| parent | 284e46dbf3c04753599064f03f192774abdc0236 (diff) | |
| download | telepathy-haze-2a4da279d880b50c5dbf6f55116d1a0087ef4d71.tar.gz | |
haze_protocol_get_connection_details: use channel manager GTypes
This catches up with an API change in my telepathy-glib branch, made in
response to Will's review comments on this branch.
Diffstat (limited to 'src/protocol.c')
| -rw-r--r-- | src/protocol.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/protocol.c b/src/protocol.c index 9e2f180..c62e77e 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -776,7 +776,7 @@ haze_protocol_get_interfaces (TpBaseProtocol *base) static void haze_protocol_get_connection_details (TpBaseProtocol *base, GStrv *connection_interfaces, - GPtrArray **requestable_channel_classes, + GType **channel_manager_types, gchar **icon_name, gchar **english_name, gchar **vcard_field) @@ -789,18 +789,16 @@ haze_protocol_get_connection_details (TpBaseProtocol *base, (gchar **) haze_connection_get_implemented_interfaces ()); } - if (requestable_channel_classes != NULL) + if (channel_manager_types != NULL) { - *requestable_channel_classes = g_ptr_array_new (); - - haze_im_channel_factory_append_channel_classes ( - *requestable_channel_classes); - haze_contact_list_append_channel_classes ( - *requestable_channel_classes); + GType types[] = { HAZE_TYPE_IM_CHANNEL_FACTORY, + HAZE_TYPE_CONTACT_LIST, #ifdef ENABLE_MEDIA - haze_media_manager_append_channel_classes ( - *requestable_channel_classes); + HAZE_TYPE_MEDIA_MANAGER, #endif + G_TYPE_INVALID }; + + *channel_manager_types = g_memdup (types, sizeof (types)); } if (english_name != NULL) |