[pitivi: 13/18] timeline.py, ui.trackobject.py: check in alessandro's fix for 597703

[Edward Hervey <edwardrv src gnome org>]

commit ffdc5c39f6c9b5b7b41b6f31ed10a8a5a9a9e652
Author: Brandon Lewis <brandon_lewis alum berkeley edu>
Date:   Thu Oct 29 15:10:22 2009 -0700

    timeline.py,ui.trackobject.py: check in alessandro's fix for 597703

 pitivi/timeline/timeline.py |    2 +-
 pitivi/ui/trackobject.py    |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 8e1edab..23068e0 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1260,7 +1260,7 @@ class TrimStartContext(EditingContext):
         self.default_originals = self._saveValues([focus_timeline_object])
 
         ripple = self.timeline.getObjsBeforeTime(focus.start)
-        assert not focus.timeline_object in ripple
+        assert not focus.timeline_object in ripple or focus.duration == 0
         self.ripple_originals = self._saveValues(ripple)
         self.ripple_offsets = self._getOffsets(focus.start, focus.priority,
             ripple)
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 7f37924..1697af5 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -406,6 +406,9 @@ class TrackObject(View, goocanvas.Group, Zoomable):
         y = (self.height + LAYER_SPACING) * self.element.priority
         self.set_simple_transform(x, y, 1, 0)
         width = self.nsToPixel(self.element.duration)
+        min_width = self.start_handle.props.width * 2
+        if width < min_width:
+            width = min_width
         w = width - self.end_handle.props.width
         self.name.props.clip_path = "M%g,%g h%g v%g h-%g z" % (
             0, 0, w, self.height, w)