summaryrefslogtreecommitdiff
path: root/gst/gstpluginfeature.c
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-07-31 10:10:27 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-07-31 10:10:27 +0000
commit54852ef3768fd207e07b95eee41646831d994971 (patch)
tree0c74efe52b0f4891cd6792359b2bc9e11dcf8050 /gst/gstpluginfeature.c
parent36c2aadf2568b5f3cce6512eb499ba5460843fb0 (diff)
gst/gstpluginfeature.c: Revert patch from #459466 until after the release and we can work out exactly what the proble...
Original commit message from CVS: * gst/gstpluginfeature.c: (gst_plugin_feature_finalize), (gst_plugin_feature_set_name): Revert patch from #459466 until after the release and we can work out exactly what the problem is (if any).
Diffstat (limited to 'gst/gstpluginfeature.c')
-rw-r--r--gst/gstpluginfeature.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c
index 66fdbf19b1..4430874936 100644
--- a/gst/gstpluginfeature.c
+++ b/gst/gstpluginfeature.c
@@ -68,6 +68,7 @@ gst_plugin_feature_finalize (GObject * object)
GST_DEBUG ("finalizing feature %p: '%s'", feature,
GST_PLUGIN_FEATURE_NAME (feature));
+ g_free (feature->name);
g_free (feature->plugin_name);
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -183,9 +184,9 @@ gst_plugin_feature_set_name (GstPluginFeature * feature, const gchar * name)
if (feature->name) {
g_return_if_fail (strcmp (feature->name, name) == 0);
} else {
- gst_object_set_name (GST_OBJECT (feature), name);
- feature->name = GST_OBJECT_NAME (GST_OBJECT (feature));
+ feature->name = g_strdup (name);
}
+ gst_object_set_name (GST_OBJECT (feature), feature->name);
}
/**