summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2016-08-08 10:13:13 -0400
committerThibault Saunier <tsaunier@gnome.org>2016-08-08 10:13:13 -0400
commit7328a17939645bdc63e46b9cb0bd1a29d0614d72 (patch)
tree3eae73890c342316df2a1cfe18cda579ca6874ba
parent258a65b0e854130d1c66af9bf288b1c2d490b04c (diff)
Revert "ges: fix various leaks with usage of ges_timeline_element_lookup_child"
This reverts commit 06515f01c9f03c15a637284462dfbf17b68f7cbc. This commits introduces a refcount issue on the 1.8 branch.
-rw-r--r--ges/ges-container.c3
-rw-r--r--ges/ges-timeline-element.c6
2 files changed, 1 insertions, 8 deletions
diff --git a/ges/ges-container.c b/ges/ges-container.c
index 1e803de4..f52aea00 100644
--- a/ges/ges-container.c
+++ b/ges/ges-container.c
@@ -218,7 +218,7 @@ _ges_container_add_child_properties (GESContainer * container,
&prop_child, NULL)) {
ges_timeline_element_add_child_property (GES_TIMELINE_ELEMENT (container),
child_props[i], prop_child);
- gst_object_unref (prop_child);
+
}
g_param_spec_unref (child_props[i]);
@@ -244,7 +244,6 @@ _ges_container_remove_child_properties (GESContainer * container,
&prop_child, NULL)) {
ges_timeline_element_remove_child_property (GES_TIMELINE_ELEMENT
(container), child_props[i]);
- gst_object_unref (prop_child);
}
diff --git a/ges/ges-timeline-element.c b/ges/ges-timeline-element.c
index 107547e3..e03f1f0a 100644
--- a/ges/ges-timeline-element.c
+++ b/ges/ges-timeline-element.c
@@ -1315,8 +1315,6 @@ ges_timeline_element_set_child_property_by_pspec (GESTimelineElement * self,
goto not_found;
g_object_set_property (child, pspec->name, value);
- gst_object_unref (child);
- g_param_spec_unref (pspec);
return;
@@ -1495,7 +1493,6 @@ ges_timeline_element_set_child_property_valist (GESTimelineElement * self,
g_object_set_property (child, pspec->name, &value);
gst_object_unref (child);
- g_param_spec_unref (pspec);
g_value_unset (&value);
name = va_arg (var_args, gchar *);
@@ -1512,8 +1509,6 @@ cant_copy:
GST_WARNING_OBJECT (self, "error copying value %s in %p: %s", pspec->name,
self, error);
- gst_object_unref (child);
- g_param_spec_unref (pspec);
g_value_unset (&value);
return;
}
@@ -1579,7 +1574,6 @@ ges_timeline_element_get_child_property_valist (GESTimelineElement * self,
g_value_init (&value, pspec->value_type);
g_object_get_property (child, pspec->name, &value);
gst_object_unref (child);
- g_param_spec_unref (pspec);
G_VALUE_LCOPY (&value, var_args, 0, &error);
if (error)