From fc8f06eedb90c3f633b99960dde6a13b521dfbde Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Fri, 8 Feb 2013 17:19:39 -0300
Subject: [PATCH] Properly rename object-added to clip-added

---
 ges/ges-clip.c           |  2 +-
 ges/ges-timeline-layer.c | 12 ++++++------
 ges/ges-timeline.c       |  6 +++---
 tests/examples/ges-ui.c  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ges/ges-clip.c b/ges/ges-clip.c
index d862719..9593b3f 100644
--- a/ges/ges-clip.c
+++ b/ges/ges-clip.c
@@ -599,7 +599,7 @@ ges_clip_release_track_element (GESClip * object,
   object->trackelements = g_list_remove (object->trackelements, trackelement);
 
   if (GES_IS_BASE_EFFECT (trackelement)) {
-    /* emit 'object-removed' */
+    /* emit 'clip-removed' */
     object->priv->nb_effects--;
     g_signal_emit (object, ges_clip_signals[EFFECT_REMOVED], 0,
         GES_BASE_EFFECT (trackelement));
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index a73d92f..26bc3e3 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -169,26 +169,26 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
           "whether the transitions are added", FALSE, G_PARAM_READWRITE));
 
   /**
-   * GESTimelineLayer::object-added:
+   * GESTimelineLayer::clip-added:
    * @layer: the #GESTimelineLayer
    * @object: the #GESClip that was added.
    *
    * Will be emitted after the object was added to the layer.
    */
   ges_timeline_layer_signals[OBJECT_ADDED] =
-      g_signal_new ("object-added", G_TYPE_FROM_CLASS (klass),
+      g_signal_new ("clip-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass, object_added),
       NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, GES_TYPE_CLIP);
 
   /**
-   * GESTimelineLayer::object-removed:
+   * GESTimelineLayer::clip-removed:
    * @layer: the #GESTimelineLayer
    * @object: the #GESClip that was removed
    *
    * Will be emitted after the object was removed from the layer.
    */
   ges_timeline_layer_signals[OBJECT_REMOVED] =
-      g_signal_new ("object-removed", G_TYPE_FROM_CLASS (klass),
+      g_signal_new ("clip-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GESTimelineLayerClass,
           object_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE,
       1, GES_TYPE_CLIP);
@@ -311,7 +311,7 @@ ges_timeline_layer_remove_object (GESTimelineLayer * layer, GESClip * object)
   }
   g_object_unref (current_layer);
 
-  /* emit 'object-removed' */
+  /* emit 'clip-removed' */
   g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_REMOVED], 0, object);
 
   /* inform the object it's no longer in a layer */
@@ -555,7 +555,7 @@ ges_timeline_layer_add_object (GESTimelineLayer * layer, GESClip * object)
    * priority */
   ges_timeline_layer_resync_priorities (layer);
 
-  /* emit 'object-added' */
+  /* emit 'clip-added' */
   g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_ADDED], 0, object);
 
   return TRUE;
diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 3d136d7..804c239 100644
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -2281,10 +2281,10 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
 
   g_hash_table_insert (timeline->priv->by_layer, layer, g_sequence_new (NULL));
 
-  /* Connect to 'object-added'/'object-removed' signal from the new layer */
-  g_signal_connect (layer, "object-added", G_CALLBACK (layer_object_added_cb),
+  /* Connect to 'clip-added'/'clip-removed' signal from the new layer */
+  g_signal_connect (layer, "clip-added", G_CALLBACK (layer_object_added_cb),
       timeline);
-  g_signal_connect (layer, "object-removed",
+  g_signal_connect (layer, "clip-removed",
       G_CALLBACK (layer_object_removed_cb), timeline);
   g_signal_connect (layer, "notify::priority",
       G_CALLBACK (layer_priority_changed_cb), timeline);
diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c
index 90750c6..7db311f 100644
--- a/tests/examples/ges-ui.c
+++ b/tests/examples/ges-ui.c
@@ -758,9 +758,9 @@ layer_added_cb (GESTimeline * timeline, GESTimelineLayer * layer, App * app)
     return;
   }
 
-  g_signal_connect (app->layer, "object-added",
+  g_signal_connect (app->layer, "clip-added",
       G_CALLBACK (layer_object_added_cb), app);
-  g_signal_connect (app->layer, "object-removed",
+  g_signal_connect (app->layer, "clip-removed",
       G_CALLBACK (layer_object_removed_cb), app);
   g_signal_connect (app->layer, "object-moved",
       G_CALLBACK (layer_object_moved_cb), app);
-- 
2.7.4