diff options
author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-21 15:39:07 +0200 |
---|---|---|
committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-21 15:39:07 +0200 |
commit | 436ee2d858d8260fd5d375dc2c9b6c9e81715c02 (patch) | |
tree | e5ac9d5df22a7698d07b30aaf949f5c2af4177c2 /src | |
parent | 8fc49d0c367121d5fbaadbe6126ee37617cfb883 (diff) | |
parent | 41f4f45f8d35a5f0e199b887298219b4c6ddd493 (diff) |
Merge commit 'refs/merge-requests/6' of git://gitorious.org/meego-cellular/telepathy-ring into merger
Diffstat (limited to 'src')
-rw-r--r-- | src/ring-call-channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ring-call-channel.c b/src/ring-call-channel.c index bd91f5b..d53c85c 100644 --- a/src/ring-call-channel.c +++ b/src/ring-call-channel.c @@ -172,11 +172,11 @@ static gboolean ring_call_channel_remote_pending( G_DEFINE_TYPE_WITH_CODE( RingCallChannel, ring_call_channel, RING_TYPE_MEDIA_CHANNEL, - G_IMPLEMENT_INTERFACE(RING_TYPE_MEMBER_CHANNEL, NULL) + G_IMPLEMENT_INTERFACE(RING_TYPE_MEMBER_CHANNEL, NULL); G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP, - tp_group_mixin_iface_init) + tp_group_mixin_iface_init); G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STATE, - ring_channel_call_state_iface_init) + ring_channel_call_state_iface_init); G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT, NULL); G_IMPLEMENT_INTERFACE(RING_TYPE_SVC_CHANNEL_INTERFACE_SPLITTABLE, |