[farsight2/master] Remove gstfsmsnconference.c

[Olivier Crête]

---
 gst/fsmsnconference/Makefile.am          |    2 +-
 gst/fsmsnconference/fs-msn-conference.c  |   19 +++++++++++
 gst/fsmsnconference/gstfsmsnconference.c |   51 ------------------------------
 3 files changed, 20 insertions(+), 52 deletions(-)
 delete mode 100644 gst/fsmsnconference/gstfsmsnconference.c

diff --git a/gst/fsmsnconference/Makefile.am b/gst/fsmsnconference/Makefile.am
index 02a6ff5..7579f4d 100644
--- a/gst/fsmsnconference/Makefile.am
+++ b/gst/fsmsnconference/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libfsmsnconference.la
 
-libfsmsnconference_la_SOURCES = gstfsmsnconference.c \
+libfsmsnconference_la_SOURCES = \
 	fs-msn-conference.c \
 	fs-msn-participant.c \
 	fs-msn-session.c \
diff --git a/gst/fsmsnconference/fs-msn-conference.c b/gst/fsmsnconference/fs-msn-conference.c
index aa88011..020005f 100644
--- a/gst/fsmsnconference/fs-msn-conference.c
+++ b/gst/fsmsnconference/fs-msn-conference.c
@@ -414,3 +414,22 @@ fs_msn_conference_new_participant (FsBaseConference *conf,
 
   return new_participant;
 }
+
+
+static gboolean plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "fsmsnconference",
+                               GST_RANK_NONE, FS_TYPE_MSN_CONFERENCE);
+}
+
+GST_PLUGIN_DEFINE (
+  GST_VERSION_MAJOR,
+  GST_VERSION_MINOR,
+  "fsmsnconference",
+  "Farsight MSN Conference plugin",
+  plugin_init,
+  VERSION,
+  "LGPL",
+  "Farsight",
+  "http://farsight.freedesktop.org/"
+)
diff --git a/gst/fsmsnconference/gstfsmsnconference.c b/gst/fsmsnconference/gstfsmsnconference.c
deleted file mode 100644
index 2acfacf..0000000
--- a/gst/fsmsnconference/gstfsmsnconference.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Farsight2 - Farsight MSN Conference Implementation
- *
- * Copyright 2008 Richard Spiers <richard.spiers at gmail.com>
- * Copyright 2007 Nokia Corp.
- * Copyright 2007 Collabora Ltd.
- *  @author: Olivier Crete <olivier.crete at collabora.co.uk>
- *
- * gstfsmsnconference.c - MSN implementation for Farsight Conference Gstreamer
- *                        Elements
- *
- * This library 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 library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-
-#include "fs-msn-conference.h"
-
-static gboolean plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "fsmsnconference",
-                               GST_RANK_NONE, FS_TYPE_MSN_CONFERENCE);
-}
-
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "fsmsnconference",
-  "Farsight MSN Conference plugin",
-  plugin_init,
-  VERSION,
-  "LGPL",
-  "Farsight",
-  "http://farsight.freedesktop.org/"
-)
-- 
1.5.6.5