From 64a173ce325b9ba30079ce5b9f3bbe1615302ecb Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 8 Nov 2011 11:17:56 +1100
Subject: Remove dead files codec-preferences and element-preferences

These are now handled for us by Farsight. Hooray for Farsight.
---
 src/empathy-streamed-media-handler.c | 23 -----------------------
 src/empathy-streamed-media-window.c  | 24 +++++++-----------------
 2 files changed, 7 insertions(+), 40 deletions(-)

(limited to 'src')

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);
 }
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index c74910b6b..22ecbd282 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -35,6 +35,7 @@
 #include <telepathy-glib/util.h>
 
 #include <gst/farsight/fs-element-added-notifier.h>
+#include <gst/farsight/fs-utils.h>
 
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-utils.h>
@@ -981,8 +982,6 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self)
   GtkWidget *arrow;
   GtkWidget *page;
   gchar *filename;
-  GKeyFile *keyfile;
-  GError *error = NULL;
   GtkWidget *scroll;
 
   filename = empathy_file_lookup ("empathy-streamed-media-window.ui", "src");
@@ -1084,21 +1083,6 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self)
   /* The call will be started as soon the pipeline is playing */
   priv->start_call_when_playing = TRUE;
 
-  keyfile = g_key_file_new ();
-  filename = empathy_file_lookup ("element-properties", "data");
-  if (g_key_file_load_from_file (keyfile, filename, G_KEY_FILE_NONE, &error))
-    {
-      fs_element_added_notifier_set_properties_from_keyfile (priv->fsnotifier,
-          keyfile);
-    }
-  else
-    {
-      g_warning ("Could not load element-properties file: %s", error->message);
-      g_key_file_free (keyfile);
-      g_clear_error (&error);
-    }
-  g_free (filename);
-
   priv->vbox = gtk_vbox_new (FALSE, 3);
   gtk_box_pack_start (GTK_BOX (priv->content_hbox), priv->vbox,
       FALSE, FALSE, CONTENT_HBOX_CHILDREN_PACKING_PADDING);
@@ -1759,6 +1743,12 @@ empathy_streamed_media_window_conference_added_cb (EmpathyStreamedMediaHandler *
 {
   EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data);
   EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self);
+  GKeyFile *keyfile;
+
+  keyfile = fs_utils_get_default_element_properties (conference);
+  if (keyfile != NULL)
+    fs_element_added_notifier_set_properties_from_keyfile (priv->fsnotifier,
+        keyfile);
 
   gst_bin_add (GST_BIN (priv->pipeline), conference);
 
-- 
cgit v1.2.3