[telepathy-gabble/master] Remove MediaFactory property from MediaChannel.

[Will Thompson]

It wasn't used: everything just gets the factory from the connection,
which is fine.
---
 src/media-channel-internal.h |    2 --
 src/media-channel.c          |   13 -------------
 src/media-factory.c          |    1 -
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/media-channel-internal.h b/src/media-channel-internal.h
index cc8f89e..d78f7a5 100644
--- a/src/media-channel-internal.h
+++ b/src/media-channel-internal.h
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 
-#include "media-factory.h"
 #include "media-stream.h"
 #include "jingle-session.h"
 #include "jingle-media-rtp.h"
@@ -41,7 +40,6 @@ struct _GabbleMediaChannelPrivate
   TpHandle initial_peer;
   gboolean peer_in_rp;
 
-  GabbleMediaFactory *factory;
   GabbleJingleSession *session;
 
   /* array of referenced GabbleMediaStream* */
diff --git a/src/media-channel.c b/src/media-channel.c
index 05320fc..1d966e1 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -103,7 +103,6 @@ enum
   PROP_CONNECTION,
   PROP_CREATOR,
   PROP_CREATOR_ID,
-  PROP_FACTORY,
   PROP_INTERFACES,
   PROP_CHANNEL_DESTROYED,
   PROP_CHANNEL_PROPERTIES,
@@ -438,9 +437,6 @@ gabble_media_channel_get_property (GObject    *object,
     case PROP_REQUESTED:
       g_value_set_boolean (value, (priv->creator == base_conn->self_handle));
       break;
-    case PROP_FACTORY:
-      g_value_set_object (value, priv->factory);
-      break;
     case PROP_INTERFACES:
       g_value_set_boxed (value, gabble_media_channel_interfaces);
       break;
@@ -512,9 +508,6 @@ gabble_media_channel_set_property (GObject     *object,
     case PROP_CREATOR:
       priv->creator = g_value_get_uint (value);
       break;
-    case PROP_FACTORY:
-      priv->factory = g_value_get_object (value);
-      break;
     case PROP_INITIAL_PEER:
       priv->initial_peer = g_value_get_uint (value);
 
@@ -672,12 +665,6 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_REQUESTED, param_spec);
 
-  param_spec = g_param_spec_object ("factory", "GabbleMediaFactory object",
-      "The factory that created this object.",
-      GABBLE_TYPE_MEDIA_FACTORY,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_FACTORY, param_spec);
-
   param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
       "Additional Channel.Interface.* interfaces",
       G_TYPE_STRV,
diff --git a/src/media-factory.c b/src/media-factory.c
index 30d05b0..b2cec6b 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -263,7 +263,6 @@ new_media_channel (GabbleMediaFactory *fac,
 
   chan = g_object_new (GABBLE_TYPE_MEDIA_CHANNEL,
                        "connection", priv->conn,
-                       "factory", fac,
                        "object-path", object_path,
                        "session", sess,
                        "initial-peer", maybe_peer,
-- 
1.5.6.5