diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 22:13:17 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 23:02:29 +0800 |
| commit | b48a8176d050de2d03bed6c5f00b451f3ca5c750 (patch) | |
| tree | 7a1c40708fbf6126e0566553006de8b016f780a2 /libempathy-gtk | |
| parent | 988a99a9a54a20fff1846275f98a0c3b3c4c3469 (diff) | |
| download | gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar.gz gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar.bz2 gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar.lz gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar.xz gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.tar.zst gsoc2013-empathy-b48a8176d050de2d03bed6c5f00b451f3ca5c750.zip | |
always build empathy-call
https://bugzilla.gnome.org/show_bug.cgi?id=629902
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 4f0185117..1dca38645 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -132,7 +132,6 @@ create_streamed_media_channel_cb (GObject *source, } } -#ifdef HAVE_CALL static void create_call_channel_cb (GObject *source, GAsyncResult *result, @@ -202,35 +201,6 @@ call_new_with_streams (const gchar *contact, g_object_unref (call_req); } -#else /* HAVE_CALL */ - -static void -sm_new_with_streams (const gchar *contact, - TpAccount *account, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp) -{ - GHashTable *streamed_media_request; - TpAccountChannelRequest *streamed_media_req; - - /* StreamedMedia */ - streamed_media_request = empathy_call_create_streamed_media_request ( - contact, initial_audio, initial_video); - - streamed_media_req = tp_account_channel_request_new (account, - streamed_media_request, - timestamp); - - g_hash_table_unref (streamed_media_request); - - tp_account_channel_request_create_channel_async (streamed_media_req, - EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL); - - g_object_unref (streamed_media_req); -} -#endif /* HAVE_CALL */ - void empathy_call_new_with_streams (const gchar *contact, TpAccount *account, @@ -238,13 +208,8 @@ empathy_call_new_with_streams (const gchar *contact, gboolean initial_video, gint64 timestamp) { -#ifdef HAVE_CALL call_new_with_streams (contact, account, initial_audio, initial_video, timestamp); -#else - sm_new_with_streams (contact, account, initial_audio, initial_video, - timestamp); -#endif } void |