Merge from 1.2 main.

1 files changed, 3 insertions, 11 deletions

diff --git a/src/input/input_http.c b/src/input/input_http.c
index 5975bb64b..38658b161 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1065,14 +1065,6 @@ static input_plugin_t *http_class_get_instance (input_class_t *cls_gen, xine_str
   return &this->input_plugin;
 }
 
-static const char *http_class_get_description (input_class_t *this_gen) {
-  return _("http input plugin");
-}
-
-static const char *http_class_get_identifier (input_class_t *this_gen) {
-  return "http";
-}
-
 static void http_class_dispose (input_class_t *this_gen) {
   http_input_class_t  *this = (http_input_class_t *) this_gen;
   
@@ -1093,8 +1085,8 @@ static void *init_class (xine_t *xine, void *data) {
   config       = xine->config;
 
   this->input_class.get_instance       = http_class_get_instance;
-  this->input_class.get_identifier     = http_class_get_identifier;
-  this->input_class.get_description    = http_class_get_description;
+  this->input_class.identifier         = "http";
+  this->input_class.description        = N_("http input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = http_class_dispose;
@@ -1166,6 +1158,6 @@ 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 | PLUGIN_MUST_PRELOAD, 17, "http", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "http", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };