[farsight2/master] Base FsBaseConference on GstBin instead of GstElement

[Olivier Crête]

---
 gst-libs/gst/farsight/fs-base-conference.c |    4 ++--
 gst-libs/gst/farsight/fs-base-conference.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-base-conference.c b/gst-libs/gst/farsight/fs-base-conference.c
index f99d8f1..c3c458b 100644
--- a/gst-libs/gst/farsight/fs-base-conference.c
+++ b/gst-libs/gst/farsight/fs-base-conference.c
@@ -62,7 +62,7 @@ struct _FsBaseConferencePrivate
   GPtrArray *session_list;
 };
 
-static GstElementClass *parent_class = NULL;
+static GstBinClass *parent_class = NULL;
 
 static void fs_base_conference_interface_init (gpointer g_iface,
                                                gpointer iface_data);
@@ -105,7 +105,7 @@ fs_base_conference_get_type (void)
 
 
 
-    base_conference_type = g_type_register_static (GST_TYPE_ELEMENT,
+    base_conference_type = g_type_register_static (GST_TYPE_BIN,
         "FsBaseConference", &base_conference_info, G_TYPE_FLAG_ABSTRACT);
 
     g_type_add_interface_static (base_conference_type,
diff --git a/gst-libs/gst/farsight/fs-base-conference.h b/gst-libs/gst/farsight/fs-base-conference.h
index ec783a6..f0b48c7 100644
--- a/gst-libs/gst/farsight/fs-base-conference.h
+++ b/gst-libs/gst/farsight/fs-base-conference.h
@@ -56,7 +56,7 @@ typedef struct _FsBaseConferencePrivate FsBaseConferencePrivate;
 
 struct _FsBaseConference
 {
-  GstElement parent;
+  GstBin parent;
   FsBaseConferencePrivate *priv;
 
   /*< private >*/
@@ -66,7 +66,7 @@ struct _FsBaseConference
 
 struct _FsBaseConferenceClass
 {
-  GstElementClass parent_class;
+  GstBinClass parent_class;
 
   /*< public >*/
   /* virtual methods */
-- 
1.5.6.5