Merge from 1.2 main.

1 files changed, 4 insertions, 18 deletions

diff --git a/src/input/input_net.c b/src/input/input_net.c
index b3d7a5396..7a52f670d 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -505,20 +505,6 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre
  *  net plugin class
  */
  
-static const char *net_class_get_description (input_class_t *this_gen) {
-	return _("net input plugin as shipped with xine");
-}
-
-static const char *net_class_get_identifier (input_class_t *this_gen) {
-  return "TCP";
-}
-
-static void net_class_dispose (input_class_t *this_gen) {
-  net_input_class_t  *this = (net_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   net_input_class_t  *this;
@@ -528,11 +514,11 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance      = net_class_get_instance;
-  this->input_class.get_description   = net_class_get_description;
-  this->input_class.get_identifier    = net_class_get_identifier;
+  this->input_class.description       = N_("net input plugin as shipped with xine");
+  this->input_class.identifier        = "TCP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
-  this->input_class.dispose           = net_class_dispose;
+  this->input_class.dispose           = default_input_class_dispose;
   this->input_class.eject_media       = NULL;
 
   return this;
@@ -544,7 +530,7 @@ static void *init_class (xine_t *xine, void *data) {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_INPUT, 17, "tcp", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "tcp", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };