diff options
| author | mathieu duponchelle <duponc_m@Meh.(none)> | 2011-12-23 17:16:20 +0100 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@collabora.com> | 2012-01-11 11:56:17 -0300 |
| commit | 2376c313a13dac4c53132b6b7690dc3a83c9ab94 (patch) | |
| tree | 5c34d160e9a749f4a46180d8fb70e4358bcab71a | |
| parent | 1bd6e9b7580775fe9b170c85552dc5e90507e327 (diff) | |
Disconnect handlers when object is removed from layer
| -rw-r--r-- | ges/ges-timeline-layer.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c index d39e2607..65ffefe0 100644 --- a/ges/ges-timeline-layer.c +++ b/ges/ges-timeline-layer.c @@ -216,7 +216,7 @@ ges_timeline_layer_init (GESTimelineLayer * self) self->max_gnl_priority = LAYER_HEIGHT; self->priv->signal_table = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, - g_free); + NULL); } /** @@ -434,7 +434,7 @@ track_object_added_cb (GESTimelineObject * object, if (!g_hash_table_lookup (signal_table, track)) { ptr = g_signal_connect (track, "track-object-removed", (GCallback) track_object_deleted_cb, NULL); - g_hash_table_insert (signal_table, track, &ptr); + g_hash_table_insert (signal_table, track, GINT_TO_POINTER (ptr)); } return; } @@ -749,6 +749,14 @@ look_for_transition (GESTrackObject * track_object, GESTimelineLayer * layer) g_list_free_full (track_objects, g_object_unref); } +static gboolean +disconnect_handlers (GESTrack * track, gpointer * ptr) +{ + g_signal_handler_disconnect (track, GPOINTER_TO_INT (ptr)); + + return TRUE; +} + /** * ges_timeline_layer_remove_object: * @layer: a #GESTimelineLayer @@ -793,6 +801,9 @@ ges_timeline_layer_remove_object (GESTimelineLayer * layer, g_list_free_full (trackobjects, g_object_unref); } + g_hash_table_foreach_remove (layer->priv->signal_table, + (GHRFunc) disconnect_handlers, NULL); + /* emit 'object-removed' */ g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_REMOVED], 0, object); |