From 9b2cdbb355577cded17cba6f0fbd22c218191ccf Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 23 May 2019 17:20:56 -0400 Subject: [PATCH] overrides: Make sure overrides are in hierarchy order Otherwise method order resolution will not be correct --- bindings/python/gi/overrides/GES.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/bindings/python/gi/overrides/GES.py b/bindings/python/gi/overrides/GES.py index af51e61..91e515f 100644 --- a/bindings/python/gi/overrides/GES.py +++ b/bindings/python/gi/overrides/GES.py @@ -50,16 +50,6 @@ python module to use with GES 0.10" warnings.warn(warn_msg, RuntimeWarning) - -class TrackElement(GES.TrackElement): - def set_child_property(self, prop_name, prop_value): - return TimelineElement.set_child_property(self, prop_name, prop_value) - - -TrackElement = override(TrackElement) -__all__.append('TrackElement') - - class TimelineElement(GES.TimelineElement): def __repr__(self): return "%s [%s (%s) %s]" % ( @@ -81,6 +71,14 @@ class TimelineElement(GES.TimelineElement): TimelineElement = override(TimelineElement) __all__.append('TimelineElement') +class TrackElement(GES.TrackElement): + def set_child_property(self, prop_name, prop_value): + return TimelineElement.set_child_property(self, prop_name, prop_value) + +TrackElement = override(TrackElement) +__all__.append('TrackElement') + + class Container(GES.Container): def edit(self, layers, new_layer_priority, mode, edge, position): return GES.TimelineElement.edit(self, layers, new_layer_priority, mode, edge, position) -- 2.7.4