aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-streamed-media-handler.c
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-08 08:17:56 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-08 08:22:52 +0800
commit64a173ce325b9ba30079ce5b9f3bbe1615302ecb (patch)
treede432548011f686eb145bb0b4f9db217d4f0ddb4 /src/empathy-streamed-media-handler.c
parent945df143a94c9c64c925591e09e6dd28c43408ff (diff)
downloadgsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.gz
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.bz2
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.lz
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.xz
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.zst
gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.zip
Remove dead files codec-preferences and element-preferences
These are now handled for us by Farsight. Hooray for Farsight.
Diffstat (limited to 'src/empathy-streamed-media-handler.c')
-rw-r--r--src/empathy-streamed-media-handler.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 67527d8e4..a3c539773 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -708,27 +708,6 @@ empathy_streamed_media_handler_tf_channel_closed_cb (TfChannel *tfchannel,
g_signal_emit (G_OBJECT (handler), signals[CLOSED], 0);
}
-static GList *
-empathy_streamed_media_handler_tf_channel_codec_config_cb (TfChannel *channel,
- guint stream_id, FsMediaType media_type, guint direction, gpointer user_data)
-{
- gchar *filename = empathy_file_lookup ("codec-preferences", "data");
- GList *codecs;
- GError *error = NULL;
-
- codecs = fs_codec_list_from_keyfile (filename, &error);
- g_free (filename);
-
- if (!codecs)
- {
- g_warning ("No codec-preferences file: %s",
- error ? error->message : "No error message");
- }
- g_clear_error (&error);
-
- return codecs;
-}
-
static void
empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self)
{
@@ -748,8 +727,6 @@ empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self)
G_CALLBACK (empathy_streamed_media_handler_tf_channel_stream_created_cb), self);
g_signal_connect (priv->tfchannel, "closed",
G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
- g_signal_connect (priv->tfchannel, "stream-get-codec-config",
- G_CALLBACK (empathy_streamed_media_handler_tf_channel_codec_config_cb), self);
g_object_unref (channel);
}