diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-24 16:40:47 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-24 16:40:47 +0800 |
| commit | a680e30ec331c9de306dc1b65928eeb8ae3d0f3e (patch) | |
| tree | a7d51e20464d618908b30cea0c513be512e30329 /src | |
| parent | 9eaf13ca3904e586d78866babf68e30c28c67b0d (diff) | |
| download | gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar.gz gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar.bz2 gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar.lz gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar.xz gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.tar.zst gsoc2013-empathy-a680e30ec331c9de306dc1b65928eeb8ae3d0f3e.zip | |
Remove conditional build of VOIP.
svn path=/trunk/; revision=1038
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-filter.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/empathy-filter.c b/src/empathy-filter.c index d32a9dfe1..17da506a8 100644 --- a/src/empathy-filter.c +++ b/src/empathy-filter.c @@ -257,7 +257,6 @@ filter_chat_handle_channel (EmpathyFilter *filter, } } -#ifdef HAVE_VOIP static void filter_call_dispatch (EmpathyFilter *filter, gpointer user_data) @@ -314,7 +313,6 @@ filter_call_handle_channel (EmpathyFilter *filter, filter); } } -#endif static void filter_contact_list_subscribe (EmpathyFilter *filter, @@ -763,11 +761,9 @@ filter_conection_new_channel_cb (TpConnection *connection, if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { func = filter_chat_handle_channel; } -#ifdef HAVE_VOIP else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) { func = filter_call_handle_channel; } -#endif else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST)) { func = filter_contact_list_handle_channel; } @@ -820,7 +816,6 @@ filter_connection_list_channels_cb (TpConnection *connection, } } -#ifdef HAVE_VOIP static void filter_connection_advertise_capabilities_cb (TpConnection *connection, const GPtrArray *capabilities, @@ -833,19 +828,16 @@ filter_connection_advertise_capabilities_cb (TpConnection *connection, error->message); } } -#endif static void filter_connection_ready_cb (TpConnection *connection, gpointer unused, EmpathyFilter *filter) { -#ifdef HAVE_VOIP GPtrArray *capabilities; GType cap_type; GValue cap = {0, }; const gchar *remove = NULL; -#endif empathy_debug (DEBUG_DOMAIN, "Connection ready, accepting new channels"); @@ -858,7 +850,6 @@ filter_connection_ready_cb (TpConnection *connection, NULL, NULL, G_OBJECT (filter)); -#ifdef HAVE_VOIP /* Advertise VoIP capabilities */ capabilities = g_ptr_array_sized_new (1); cap_type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, @@ -879,7 +870,6 @@ filter_connection_ready_cb (TpConnection *connection, capabilities, &remove, filter_connection_advertise_capabilities_cb, NULL, NULL, G_OBJECT (filter)); -#endif } static void |