Merge from 1.2 main.

1 files changed, 3 insertions, 15 deletions

diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 3315a52ea..71a4ada85 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -211,18 +211,6 @@ gnomevfs_plugin_get_mrl (input_plugin_t *this_gen)
 	return this->mrl;
 }
 
-static const char
-*gnomevfs_klass_get_description (input_class_t *this_gen)
-{
-	return _("gnome-vfs input plugin as shipped with xine");
-}
-
-static const char
-*gnomevfs_klass_get_identifier (input_class_t *this_gen)
-{
-	return "gnomevfs";
-}
-
 static int
 gnomevfs_plugin_get_optional_data (input_plugin_t *this_gen, 
 		void *data, int data_type)
@@ -375,8 +363,8 @@ static void
 	this->xine = xine;
 
 	this->input_class.get_instance       = gnomevfs_klass_get_instance;
-	this->input_class.get_identifier     = gnomevfs_klass_get_identifier;
-	this->input_class.get_description    = gnomevfs_klass_get_description;
+	this->input_class.identifier         = "gnomevfs";
+	this->input_class.description        = N_("gnome-vfs input plugin as shipped with xine");
 	this->input_class.get_dir            = NULL;
 	this->input_class.get_autoplay_list  = NULL;
 	this->input_class.dispose            = gnomevfs_klass_dispose;
@@ -389,7 +377,7 @@ static input_info_t input_info_gnomevfs = {
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-	{ PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 17, "gnomevfs", XINE_VERSION_CODE,
+	{ PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 18, "gnomevfs", XINE_VERSION_CODE,
 		&input_info_gnomevfs, init_input_class },
 	{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };