Move src/media-factory to tpsip/media-manager

7 files changed, 11 insertions, 769 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1acf418..7b68a27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,8 +70,6 @@ libtpsip_convenience_la_SOURCES = \
     sip-connection.c \
     sip-connection-manager.h \
     sip-connection-manager.c \
-    media-factory.h \
-    media-factory.c \
     protocol.h \
     protocol.c \
     sip-connection-helpers.h \
diff --git a/src/media-factory.c b/src/media-factory.c
deleted file mode 100644
index 4b6e1c4..0000000
--- a/src/media-factory.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * media-factory.c - Media channel factory for SIP connection manager
- * Copyright (C) 2007-2008 Collabora Ltd.
- * Copyright (C) 2007-2010 Nokia Corporation
- *
- * This work is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This work is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this work; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "media-factory.h"
-
-#include <string.h>
-
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-
-#include "tpsip/media-channel.h"
-#include <tpsip/base-connection.h>
-#include <tpsip/handles.h>
-
-#include <sofia-sip/sip_status.h>
-
-#define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
-#include "tpsip/debug.h"
-
-typedef enum {
-  TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO = 1 << 0,
-  TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO = 1 << 1,
-} TpsipMediaChannelCreationFlags;
-
-static void channel_manager_iface_init (gpointer, gpointer);
-static void tpsip_media_factory_constructed (GObject *object);
-static void tpsip_media_factory_close_all (TpsipMediaFactory *fac);
-
-G_DEFINE_TYPE_WITH_CODE (TpsipMediaFactory, tpsip_media_factory,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_MANAGER,
-        channel_manager_iface_init))
-
-enum
-{
-  PROP_CONNECTION = 1,
-  PROP_STUN_SERVER,
-  PROP_STUN_PORT,
-  LAST_PROPERTY
-};
-
-typedef struct _TpsipMediaFactoryPrivate TpsipMediaFactoryPrivate;
-struct _TpsipMediaFactoryPrivate
-{
-  /* unreferenced (since it owns this factory) */
-  TpBaseConnection *conn;
-  /* array of referenced (TpsipMediaChannel *) */
-  GPtrArray *channels;
-  /* for unique channel object paths, currently always increments */
-  guint channel_index;
-
-  gulong status_changed_id;
-  gulong invite_received_id;
-
-  gchar *stun_server;
-  guint16 stun_port;
-
-  gboolean dispose_has_run;
-};
-
-#define TPSIP_MEDIA_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TPSIP_TYPE_MEDIA_FACTORY, TpsipMediaFactoryPrivate))
-
-static void
-tpsip_media_factory_init (TpsipMediaFactory *fac)
-{
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  priv->conn = NULL;
-  priv->channels = g_ptr_array_sized_new (1);
-  priv->channel_index = 0;
-  priv->dispose_has_run = FALSE;
-}
-
-static void
-tpsip_media_factory_dispose (GObject *object)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (object);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  tpsip_media_factory_close_all (fac);
-  g_assert (priv->channels == NULL);
-
-  if (G_OBJECT_CLASS (tpsip_media_factory_parent_class)->dispose)
-    G_OBJECT_CLASS (tpsip_media_factory_parent_class)->dispose (object);
-}
-
-static void
-tpsip_media_factory_finalize (GObject *object)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (object);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  g_free (priv->stun_server);
-}
-
-static void
-tpsip_media_factory_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (object);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  switch (property_id) {
-    case PROP_CONNECTION:
-      g_value_set_object (value, priv->conn);
-      break;
-    case PROP_STUN_SERVER:
-      g_value_set_string (value, priv->stun_server);
-      break;
-    case PROP_STUN_PORT:
-      g_value_set_uint (value, priv->stun_port);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-static void
-tpsip_media_factory_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (object);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  switch (property_id) {
-    case PROP_CONNECTION:
-      priv->conn = g_value_get_object (value);
-      break;
-    case PROP_STUN_SERVER:
-      g_free (priv->stun_server);
-      priv->stun_server = g_value_dup_string (value);
-      break;
-    case PROP_STUN_PORT:
-      priv->stun_port = g_value_get_uint (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-static void
-tpsip_media_factory_class_init (TpsipMediaFactoryClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  g_type_class_add_private (klass, sizeof (TpsipMediaFactoryPrivate));
-
-  object_class->constructed = tpsip_media_factory_constructed;
-  object_class->get_property = tpsip_media_factory_get_property;
-  object_class->set_property = tpsip_media_factory_set_property;
-  object_class->dispose = tpsip_media_factory_dispose;
-  object_class->finalize = tpsip_media_factory_finalize;
-
-  param_spec = g_param_spec_object ("connection",
-      "TpsipBaseConnection object",
-      "SIP connection that owns this media channel factory",
-      TPSIP_TYPE_BASE_CONNECTION,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
-
-  param_spec = g_param_spec_string ("stun-server", "STUN server address",
-      "STUN server address",
-      NULL,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_STUN_SERVER, param_spec);
-
-  param_spec = g_param_spec_uint ("stun-port", "STUN port",
-      "STUN port.",
-      0, G_MAXUINT16,
-      TPSIP_DEFAULT_STUN_PORT,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_STUN_PORT, param_spec);
-}
-
-static void
-tpsip_media_factory_close_all (TpsipMediaFactory *fac)
-{
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  if (priv->status_changed_id != 0)
-    {
-      g_signal_handler_disconnect (priv->conn,
-          priv->status_changed_id);
-      priv->status_changed_id = 0;
-    }
-
-  if (priv->channels != NULL)
-    {
-      GPtrArray *channels;
-      guint i;
-
-      channels = priv->channels;
-      priv->channels = NULL;
-
-      for (i = 0; i < channels->len; i++)
-        {
-          TpsipMediaChannel *chan = g_ptr_array_index (channels, i);
-          g_object_unref (chan);
-        }
-
-      g_ptr_array_free (channels, TRUE);
-    }
-}
-
-/**
- * media_channel_closed_cb:
- * Signal callback for when a media channel is closed. Removes the references
- * that #TpsipMediaFactory holds to them.
- */
-static void
-media_channel_closed_cb (TpsipMediaChannel *chan, gpointer user_data)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (user_data);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  tp_channel_manager_emit_channel_closed_for_object (fac,
-      TP_EXPORTABLE_CHANNEL (chan));
-
-  if (priv->channels)
-    {
-      g_ptr_array_remove_fast (priv->channels, chan);
-      g_object_unref (chan);
-    }
-}
-
-/**
- * new_media_channel
- *
- * Creates a new empty TpsipMediaChannel.
- */
-static TpsipMediaChannel *
-new_media_channel (TpsipMediaFactory *fac,
-                   TpHandle initiator,
-                   TpHandle maybe_peer,
-                   TpsipMediaChannelCreationFlags flags)
-{
-  TpsipMediaFactoryPrivate *priv;
-  TpsipMediaChannel *chan = NULL;
-  gchar *object_path;
-  const gchar *nat_traversal = "none";
-  gboolean initial_audio;
-  gboolean initial_video;
-  gboolean immutable_streams = FALSE;
-
-  g_assert (initiator != 0);
-
-  priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-
-  object_path = g_strdup_printf ("%s/MediaChannel%u", priv->conn->object_path,
-      priv->channel_index++);
-
-  DEBUG("channel object path %s", object_path);
-
-  initial_audio = ((flags & TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO) != 0);
-  initial_video = ((flags & TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO) != 0);
-
-  g_object_get (priv->conn,
-      "immutable-streams", &immutable_streams,
-      NULL);
-
-  if (priv->stun_server != NULL)
-    {
-      nat_traversal = "stun";
-    }
-
-  chan = g_object_new (TPSIP_TYPE_MEDIA_CHANNEL,
-                       "connection", priv->conn,
-                       "object-path", object_path,
-                       "handle", maybe_peer,
-                       "initiator", initiator,
-                       "initial-audio", initial_audio,
-                       "initial-video", initial_video,
-                       "immutable-streams", immutable_streams,
-                       "nat-traversal", nat_traversal,
-                       NULL);
-
-  g_free (object_path);
-
-  if (priv->stun_server != NULL)
-    {
-      g_object_set ((GObject *) chan, "stun-server", priv->stun_server, NULL);
-      if (priv->stun_port != 0)
-        g_object_set ((GObject *) chan, "stun-port", priv->stun_port, NULL);
-    }
-
-  g_signal_connect (chan, "closed", G_CALLBACK (media_channel_closed_cb), fac);
-
-  g_ptr_array_add (priv->channels, chan);
-
-  return chan;
-}
-
-static void
-incoming_call_cb (TpsipMediaChannel *channel,
-                  TpsipMediaFactory *fac)
-{
-  g_signal_handlers_disconnect_by_func (channel,
-      G_CALLBACK (incoming_call_cb), fac);
-  tp_channel_manager_emit_new_channel (fac,
-      TP_EXPORTABLE_CHANNEL (channel), NULL);
-}
-
-static gboolean
-tpsip_nua_i_invite_cb (TpBaseConnection    *conn,
-                       const TpsipNuaEvent *ev,
-                       tagi_t               tags[],
-                       TpsipMediaFactory   *fac)
-{
-  TpsipMediaChannel *channel;
-  TpHandle handle;
-  guint channel_flags = 0;
-
-  /* figure out a handle for the identity */
-
-  handle = tpsip_handle_by_requestor (conn, ev->sip);
-  if (!handle)
-    {
-      MESSAGE ("incoming INVITE with invalid sender information");
-      nua_respond (ev->nua_handle, 400, "Invalid From address", TAG_END());
-      return TRUE;
-    }
-
-  DEBUG("Got incoming invite from <%s>",
-        tpsip_handle_inspect (conn, handle));
-
-  if (handle == conn->self_handle)
-    {
-      DEBUG("cannot handle calls from self");
-      nua_respond (ev->nua_handle, 501, "Calls from self are not supported", TAG_END());
-      return TRUE;
-    }
-
-  channel = new_media_channel (fac, handle, handle, channel_flags);
-
-  tpsip_handle_unref (conn, handle);
-
-  /* We delay emission of NewChannel(s) until we have the data on
-   * initial media */
-  g_signal_connect (channel, "incoming-call",
-      G_CALLBACK (incoming_call_cb), fac);
-
-  tpsip_media_channel_attach_to_nua_handle (channel, ev->nua_handle);
-
-  return TRUE;
-}
-
-static void
-connection_status_changed_cb (TpsipBaseConnection *conn,
-                              guint status,
-                              guint reason,
-                              TpsipMediaFactory *self)
-{
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (self);
-
-  switch (status)
-    {
-    case TP_CONNECTION_STATUS_CONNECTED:
-
-      priv->invite_received_id = g_signal_connect (conn,
-          "nua-event::nua_i_invite",
-          G_CALLBACK (tpsip_nua_i_invite_cb), self);
-
-      break;
-    case TP_CONNECTION_STATUS_DISCONNECTED:
-
-      tpsip_media_factory_close_all (self);
-
-      if (priv->invite_received_id != 0)
-        {
-          g_signal_handler_disconnect (conn, priv->invite_received_id);
-          priv->invite_received_id = 0;
-        }
-
-      break;
-    default:
-      break;
-    }
-}
-
-static void
-tpsip_media_factory_constructed (GObject *object)
-{
-  TpsipMediaFactory *self = TPSIP_MEDIA_FACTORY (object);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (self);
-  GObjectClass *parent_object_class =
-      G_OBJECT_CLASS (tpsip_media_factory_parent_class);
-
-  if (parent_object_class->constructed != NULL)
-    parent_object_class->constructed (object);
-
-  priv->status_changed_id = g_signal_connect (priv->conn,
-      "status-changed", (GCallback) connection_status_changed_cb, object);
-}
-
-static void
-tpsip_media_factory_foreach_channel (TpChannelManager *manager,
-                                     TpExportableChannelFunc foreach,
-                                     gpointer user_data)
-{
-  TpsipMediaFactory *fac = TPSIP_MEDIA_FACTORY (manager);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (fac);
-  guint i;
-
-  for (i = 0; i < priv->channels->len; i++)
-    {
-      TpExportableChannel *channel = TP_EXPORTABLE_CHANNEL (
-          g_ptr_array_index (priv->channels, i));
-
-      foreach (channel, user_data);
-    }
-}
-
-static const gchar * const media_channel_fixed_properties[] = {
-    TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
-    NULL
-};
-
-static const gchar * const named_channel_allowed_properties[] = {
-    TP_IFACE_CHANNEL ".TargetHandle",
-    TP_IFACE_CHANNEL ".TargetID",
-    TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio",
-    TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo",
-    NULL
-};
-
-/* not advertised in type_foreach_channel_class - can only be requested with
- * RequestChannel, not with CreateChannel/EnsureChannel */
-static const gchar * const anon_channel_allowed_properties[] = {
-    NULL
-};
-
-static void
-tpsip_media_factory_type_foreach_channel_class (GType type,
-    TpChannelManagerTypeChannelClassFunc func,
-    gpointer user_data)
-{
-  GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value, *handle_type_value;
-
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
-
-  handle_type_value = tp_g_value_slice_new (G_TYPE_UINT);
-  /* no uint value yet - we'll change it for each channel class */
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
-      handle_type_value);
-
-  g_value_set_uint (handle_type_value, TP_HANDLE_TYPE_CONTACT);
-  func (type, table, named_channel_allowed_properties, user_data);
-
-  g_hash_table_destroy (table);
-}
-
-typedef enum
-{
-  METHOD_REQUEST,
-  METHOD_CREATE,
-  METHOD_ENSURE,
-} RequestMethod;
-
-static gboolean
-tpsip_media_factory_requestotron (TpChannelManager *manager,
-                                  gpointer request_token,
-                                  GHashTable *request_properties,
-                                  RequestMethod method)
-{
-  TpsipMediaFactory *self = TPSIP_MEDIA_FACTORY (manager);
-  TpsipMediaFactoryPrivate *priv = TPSIP_MEDIA_FACTORY_GET_PRIVATE (self);
-  TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
-  TpHandleType handle_type;
-  TpHandle handle;
-  TpsipMediaChannel *channel = NULL;
-  GError *error = NULL;
-  GSList *request_tokens;
-  guint chan_flags = 0;
-  gboolean require_target_handle;
-  gboolean add_peer_to_remote_pending;
-
-  /* Supported modes of operation:
-   * - RequestChannel(None, 0):
-   *     channel is anonymous;
-   *     caller uses RequestStreams to set the peer and start the call.
-   * - RequestChannel(Contact, n) where n != 0:
-   *     channel has TargetHandle=n;
-   *     n is in remote pending;
-   *     call is started when caller calls RequestStreams.
-   * - CreateChannel({THT: Contact, TH: n}):
-   *     channel has TargetHandle=n
-   *     n is not in the group interface at all
-   *     call is started when caller calls RequestStreams.
-   * - EnsureChannel({THT: Contact, TH: n}):
-   *     look for a channel whose peer is n, and return that if found with
-   *       whatever properties and group membership it has;
-   *     otherwise the same as into CreateChannel
-   */
-  switch (method)
-    {
-    case METHOD_REQUEST:
-      require_target_handle = FALSE;
-      add_peer_to_remote_pending = TRUE;
-      break;
-    case METHOD_CREATE:
-    case METHOD_ENSURE:
-      require_target_handle = TRUE;
-      add_peer_to_remote_pending = FALSE;
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  if (tp_strdiff (tp_asv_get_string (request_properties,
-          TP_IFACE_CHANNEL ".ChannelType"),
-        TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
-    return FALSE;
-
-  handle_type = tp_asv_get_uint32 (request_properties,
-      TP_IFACE_CHANNEL ".TargetHandleType", NULL);
-
-  handle = tp_asv_get_uint32 (request_properties,
-      TP_IFACE_CHANNEL ".TargetHandle", NULL);
-
-  switch (handle_type)
-    {
-    case TP_HANDLE_TYPE_NONE:
-      g_assert (handle == 0);
-
-      if (require_target_handle)
-        {
-          g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-              "A valid Contact handle must be provided when requesting a media "
-              "channel");
-          goto error;
-        }
-
-      if (tp_channel_manager_asv_has_unknown_properties (request_properties,
-              media_channel_fixed_properties, anon_channel_allowed_properties,
-              &error))
-        goto error;
-
-      channel = new_media_channel (self, conn->self_handle, 0, 0);
-      break;
-
-    case TP_HANDLE_TYPE_CONTACT:
-      g_assert (handle != 0);
-
-      if (tp_channel_manager_asv_has_unknown_properties (request_properties,
-              media_channel_fixed_properties, named_channel_allowed_properties,
-              &error))
-        goto error;
-
-      /* Calls to self are problematic in terms of StreamedMedia channel
-       * interface and its semantically required Group member changes;
-       * we disable them until a better API is available through
-       * Call channel type */
-      if (handle == conn->self_handle)
-        {
-          g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
-              "Cannot call self");
-          goto error;
-        }
-
-      if (method == METHOD_ENSURE)
-        {
-          guint i;
-          TpHandle peer = 0;
-
-          for (i = 0; i < priv->channels->len; i++)
-            {
-              channel = g_ptr_array_index (priv->channels, i);
-              g_object_get (channel, "peer", &peer, NULL);
-
-              if (peer == handle)
-                {
-                  tp_channel_manager_emit_request_already_satisfied (self,
-                      request_token, TP_EXPORTABLE_CHANNEL (channel));
-                  return TRUE;
-                }
-            }
-        }
-
-      if (tp_asv_get_boolean (request_properties,
-            TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", NULL))
-        chan_flags |= TPSIP_MEDIA_CHANNEL_CREATE_WITH_AUDIO;
-
-      if (tp_asv_get_boolean (request_properties,
-            TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", NULL))
-        chan_flags |= TPSIP_MEDIA_CHANNEL_CREATE_WITH_VIDEO;
-
-      channel = new_media_channel (self, conn->self_handle, handle, chan_flags);
-
-      if (add_peer_to_remote_pending)
-        {
-          if (!_tpsip_media_channel_add_member ((GObject *) channel, handle,
-                "", &error))
-            {
-              /* FIXME: do we really want to emit Closed in this case?
-               * There wasn't a NewChannel/NewChannels emission */
-              tpsip_media_channel_close (channel);
-              goto error;
-            }
-        }
-
-      break;
-
-    default:
-      return FALSE;
-    }
-
-  g_assert (channel != NULL);
-
-  request_tokens = g_slist_prepend (NULL, request_token);
-  tp_channel_manager_emit_new_channel (self,
-      TP_EXPORTABLE_CHANNEL (channel), request_tokens);
-  g_slist_free (request_tokens);
-
-  tpsip_media_channel_create_initial_streams (channel);
-
-  return TRUE;
-
-error:
-  tp_channel_manager_emit_request_failed (self, request_token,
-      error->domain, error->code, error->message);
-  g_error_free (error);
-  return TRUE;
-}
-
-static gboolean
-tpsip_media_factory_request_channel (TpChannelManager *manager,
-                                     gpointer request_token,
-                                     GHashTable *request_properties)
-{
-  return tpsip_media_factory_requestotron (manager, request_token,
-      request_properties, METHOD_REQUEST);
-}
-
-static gboolean
-tpsip_media_factory_create_channel (TpChannelManager *manager,
-                                    gpointer request_token,
-                                    GHashTable *request_properties)
-{
-  return tpsip_media_factory_requestotron (manager, request_token,
-      request_properties, METHOD_CREATE);
-}
-
-static gboolean
-tpsip_media_factory_ensure_channel (TpChannelManager *manager,
-                                    gpointer request_token,
-                                    GHashTable *request_properties)
-{
-  return tpsip_media_factory_requestotron (manager, request_token,
-      request_properties, METHOD_ENSURE);
-}
-
-static void
-channel_manager_iface_init (gpointer g_iface,
-                            gpointer iface_data)
-{
-  TpChannelManagerIface *iface = g_iface;
-
-  iface->foreach_channel = tpsip_media_factory_foreach_channel;
-  iface->type_foreach_channel_class =
-    tpsip_media_factory_type_foreach_channel_class;
-  iface->request_channel = tpsip_media_factory_request_channel;
-  iface->create_channel = tpsip_media_factory_create_channel;
-  iface->ensure_channel = tpsip_media_factory_ensure_channel;
-}
diff --git a/src/media-factory.h b/src/media-factory.h
deleted file mode 100644
index 59697c7..0000000
--- a/src/media-factory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * media-factory.h - Media channel factory for SIP connection manager
- * Copyright (C) 2007 Collabora Ltd.
- * Copyright (C) 2007-2008 Nokia Corporation
- *
- * This work is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This work is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this work; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __TPSIP_MEDIA_FACTORY_H__
-#define __TPSIP_MEDIA_FACTORY_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _TpsipMediaFactory TpsipMediaFactory;
-typedef struct _TpsipMediaFactoryClass TpsipMediaFactoryClass;
-
-struct _TpsipMediaFactoryClass {
-  GObjectClass parent_class;
-};
-
-struct _TpsipMediaFactory {
-  GObject parent;
-};
-
-GType tpsip_media_factory_get_type(void);
-
-/* TYPE MACROS */
-#define TPSIP_TYPE_MEDIA_FACTORY \
-  (tpsip_media_factory_get_type())
-#define TPSIP_MEDIA_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPSIP_TYPE_MEDIA_FACTORY, TpsipMediaFactory))
-#define TPSIP_MEDIA_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), TPSIP_TYPE_MEDIA_FACTORY, TpsipMediaFactoryClass))
-#define TPSIP_IS_MEDIA_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPSIP_TYPE_MEDIA_FACTORY))
-#define TPSIP_IS_MEDIA_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), TPSIP_TYPE_MEDIA_FACTORY))
-#define TPSIP_MEDIA_FACTORY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_MEDIA_FACTORY, TpsipMediaFactoryClass))
-
-G_END_DECLS
-
-#endif
diff --git a/src/protocol.c b/src/protocol.c
index e52d689..be17538 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -27,12 +27,12 @@
 
 #include <tpsip/sofia-decls.h>
 #include <tpsip/handles.h>
+#include <tpsip/media-manager.h>
 #include <tpsip/text-manager.h>
 #include <sofia-sip/su_glib.h>
 
 #define DEBUG_FLAG TPSIP_DEBUG_CONNECTION
 #include "tpsip/debug.h"
-#include "media-factory.h"
 #include "sip-connection.h"
 #include "sip-connection-helpers.h"
 
@@ -418,7 +418,7 @@ get_connection_details (TpBaseProtocol *self,
     {
       GType types[] = {
           TPSIP_TYPE_TEXT_MANAGER,
-          TPSIP_TYPE_MEDIA_FACTORY,
+          TPSIP_TYPE_MEDIA_MANAGER,
           G_TYPE_INVALID };
 
       *channel_managers = g_memdup (types, sizeof(types));
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c
index 0761492..a4de677 100644
--- a/src/sip-connection-helpers.c
+++ b/src/sip-connection-helpers.c
@@ -459,8 +459,8 @@ static void
 tpsip_conn_set_stun_server_address (TpsipConnection *conn, const gchar *address)
 {
   TpsipConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn);
-  g_return_if_fail (priv->media_factory != NULL);
-  g_object_set (priv->media_factory,
+  g_return_if_fail (priv->media_manager != NULL);
+  g_object_set (priv->media_manager,
                 "stun-server", address,
                 "stun-port", priv->stun_port,
                 NULL);
diff --git a/src/sip-connection-private.h b/src/sip-connection-private.h
index c312109..dbe30c4 100644
--- a/src/sip-connection-private.h
+++ b/src/sip-connection-private.h
@@ -21,9 +21,9 @@
 #ifndef __TPSIP_CONNECTION_PRIVATE_H__
 #define __TPSIP_CONNECTION_PRIVATE_H__
 
-#include <config.h>
-#include "media-factory.h"
+#include "config.h"
 
+#include <tpsip/media-manager.h>
 #include <tpsip/sofia-decls.h>
 #include <sofia-sip/sresolv.h>
 
@@ -51,7 +51,7 @@ struct _TpsipConnectionPrivate
 
   gchar *registrar_realm;
 
-  TpsipMediaFactory *media_factory;
+  TpsipMediaManager *media_manager;
   TpSimplePasswordManager *password_manager;
 
   gchar *address;
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 8eacf28..1e1ef89 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -38,10 +38,10 @@
 #include <tpsip/event-target.h>
 #include <tpsip/handles.h>
 #include <tpsip/connection-aliasing.h>
+#include <tpsip/media-manager.h>
 #include <tpsip/text-manager.h>
 
 #include "sip-connection.h"
-#include "media-factory.h"
 
 #include "sip-connection-enumtypes.h"
 #include "sip-connection-helpers.h"
@@ -140,9 +140,9 @@ tpsip_connection_create_channel_managers (TpBaseConnection *conn)
       g_object_new (TPSIP_TYPE_TEXT_MANAGER,
         "connection", self, NULL));
 
-  priv->media_factory = g_object_new (TPSIP_TYPE_MEDIA_FACTORY,
+  priv->media_manager = g_object_new (TPSIP_TYPE_MEDIA_MANAGER,
         "connection", self, NULL);
-  g_ptr_array_add (channel_managers, priv->media_factory);
+  g_ptr_array_add (channel_managers, priv->media_manager);
 
   priv->password_manager = tp_simple_password_manager_new (
       conn);
@@ -942,7 +942,7 @@ tpsip_connection_dispose (GObject *object)
 
   /* the base class owns channel factories/managers,
    * here we just nullify the references */
-  priv->media_factory = NULL;
+  priv->media_manager = NULL;
 
   if (G_OBJECT_CLASS (tpsip_connection_parent_class)->dispose)
     G_OBJECT_CLASS (tpsip_connection_parent_class)->dispose (object);