[pitivi] There is no notion of GESTrackElement locking state anymore

[Jean-François Fortin Tam <jfft src gnome org>]

commit 2626f98a849878e79d403edeb41c717f54d75568
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Fri Mar 22 20:00:09 2013 -0300

    There is no notion of GESTrackElement locking state anymore

 pitivi/timeline/timeline.py |    5 ++---
 pitivi/timeline/track.py    |   11 ++---------
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 24a3a6e..93df502 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1738,7 +1738,7 @@ class Timeline(Gtk.Table, Loggable, Zoomable):
             self.timeline.enable_update(False)
             self.app.action_log.begin("ungroup")
             for clip in self.timeline.selection:
-                clip.objects_set_locked(False)
+                clip.ungroup(False)
             self.timeline.enable_update(True)
             self.app.action_log.commit()
 
@@ -1747,8 +1747,7 @@ class Timeline(Gtk.Table, Loggable, Zoomable):
             self.debug("Gouping selected clips %s" % self.timeline.selection)
             self.timeline.enable_update(False)
             self.app.action_log.begin("group")
-            for clip in self.timeline.selection:
-                clip.objects_set_locked(True)
+            GES.Container.group(self.timeline.selection)
             self.app.action_log.commit()
             self.timeline.enable_update(True)
 
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index 59e7057..b67ed72 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -302,11 +302,7 @@ class StartHandle(TrimHandle):
             self.debug("Trim start %s" % target)
             TrackElementController.drag_start(self, item, target, event)
 
-            if self._view.element.is_locked():
-                elem = self._view.element.get_parent()
-            else:
-                elem = self._view.element
-
+            elem = self._view.element.get_parent()
             self._context = EditingContext(elem, self._view.timeline,
                 GES.EditMode.EDIT_TRIM, GES.Edge.EDGE_START, set([]),
                 self.app.settings)
@@ -336,10 +332,7 @@ class EndHandle(TrimHandle):
             self.debug("Trim end %s" % target)
             TrackElementController.drag_start(self, item, target, event)
 
-            if self._view.element.is_locked():
-                elem = self._view.element.get_parent()
-            else:
-                elem = self._view.element
+            elem = self._view.element.get_parent()
             self._context = EditingContext(elem, self._view.timeline,
                 GES.EditMode.EDIT_TRIM, GES.Edge.EDGE_END, set([]),
                 self.app.settings)