[pitivi] timeline: Remove the (un)link actions, they will be replaced by better grouping

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

commit ffda724ee177d0ebf0f9e657be018c2c0003cfb2
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Tue Oct 9 20:52:27 2012 -0400

    timeline: Remove the (un)link actions, they will be replaced by better grouping

 pitivi/mainwindow.py        |    5 -----
 pitivi/timeline/timeline.py |   20 --------------------
 2 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 0b1441d..14b6dfc 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -144,9 +144,6 @@ def create_stock_icons():
             ('pitivi-render', _('Render'), 0, 0, 'pitivi'),
             ('pitivi-split', _('Split'), 0, 0, 'pitivi'),
             ('pitivi-keyframe', _('Keyframe'), 0, 0, 'pitivi'),
-            ('pitivi-unlink', _('Unlink'), 0, 0, 'pitivi'),
-            # Translators: This is an action, the title of a button
-            ('pitivi-link', _('Link'), 0, 0, 'pitivi'),
             ('pitivi-ungroup', _('Ungroup'), 0, 0, 'pitivi'),
             # Translators: This is an action, the title of a button
             ('pitivi-group', _('Group'), 0, 0, 'pitivi'),
@@ -156,8 +153,6 @@ def create_stock_icons():
         "pitivi-render": "pitivi-render-24.png",
         "pitivi-split": "pitivi-split-24.svg",
         "pitivi-keyframe": "pitivi-keyframe-24.svg",
-        "pitivi-unlink": "pitivi-unlink-24.svg",
-        "pitivi-link": "pitivi-relink-24.svg",
         "pitivi-ungroup": "pitivi-ungroup-24.svg",
         "pitivi-group": "pitivi-group-24.svg",
         "pitivi-align": "pitivi-align-24.svg",
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index adee272..bfd7934 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -111,8 +111,6 @@ NEXTKEYFRAME = _("Move to the next keyframe")
 ZOOM_IN = _("Zoom In")
 ZOOM_OUT = _("Zoom Out")
 ZOOM_FIT = _("Zoom Fit")
-UNLINK = _("Break links between clips")
-LINK = _("Link together arbitrary clips")
 UNGROUP = _("Ungroup clips")
 GROUP = _("Group clips")
 ALIGN = _("Align clips based on their soundtracks")
@@ -134,8 +132,6 @@ ui = '''
                 <menuitem action="Split" />
                 <menuitem action="DeleteObj" />
                 <separator />
-                <menuitem action="LinkObj" />
-                <menuitem action="UnlinkObj" />
                 <menuitem action="GroupObj" />
                 <menuitem action="UngroupObj" />
                 <menuitem action="AlignObj" />
@@ -156,8 +152,6 @@ ui = '''
             <toolitem action="Keyframe" />
             <separator />
             <toolitem action="DeleteObj" />
-            <toolitem action="UnlinkObj" />
-            <toolitem action="LinkObj" />
             <toolitem action="GroupObj" />
             <toolitem action="UngroupObj" />
             <toolitem action="AlignObj" />
@@ -1090,12 +1084,6 @@ class Timeline(Gtk.Table, Loggable, Zoomable):
             ("DeleteObj", Gtk.STOCK_DELETE, None,
             "Delete", DELETE, self.deleteSelected),
 
-            ("UnlinkObj", "pitivi-unlink", None,
-            "<Shift><Control>L", UNLINK, self.unlinkSelected),
-
-            ("LinkObj", "pitivi-link", None,
-            "<Control>L", LINK, self.linkSelected),
-
             ("UngroupObj", "pitivi-ungroup", None,
             "<Shift><Control>G", UNGROUP, self.ungroupSelected),
 
@@ -1748,14 +1736,6 @@ class Timeline(Gtk.Table, Loggable, Zoomable):
                 layer.remove_object(obj)
             self.app.action_log.commit()
 
-    def unlinkSelected(self, unused_action):
-        if self.timeline:
-            self.timeline.unlinkSelection()
-
-    def linkSelected(self, unused_action):
-        if self.timeline:
-            self.timeline.linkSelection()
-
     def ungroupSelected(self, unused_action):
         if self.timeline:
             self.debug("Ungouping selected clips %s" % self.timeline.selection)