summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-08-04 11:17:14 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-08-04 11:17:14 +0000
commit6f17d454cb535860026d05b7c6ceb7029f0cd018 (patch)
tree581637438c882d10ef23740a216321a5f211dca6
parent42d8ed05f9cbd49d9aa4c94d31eb5153cb8fe1cf (diff)
fix a wrong unref
Original commit message from CVS: fix a wrong unref
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gnl/gnltimeline.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b517553..aa30891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-04 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gnl/gnltimeline.c: (gnl_timeline_dispose):
+ fix a wrong unref, bin_remove unrefs already
+
2005-06-21 Edward Hervey <edward@fluendo.com>
* gnl/gnltimeline.c: (gnl_timeline_new):
diff --git a/common b/common
-Subproject d6e46b214fac0ecb46010ff522af2f7653e1c18
+Subproject 694de4dbf4827f372321f0634643a254d7edd98
diff --git a/gnl/gnltimeline.c b/gnl/gnltimeline.c
index 5edfaa6..5cb51e5 100644
--- a/gnl/gnltimeline.c
+++ b/gnl/gnltimeline.c
@@ -624,7 +624,6 @@ gnl_timeline_dispose (GObject *object)
}
gst_bin_remove (GST_BIN (timeline),
GST_ELEMENT (timeline->timer));
- gst_object_unref (GST_OBJECT (timeline->timer));
G_OBJECT_CLASS (parent_class)->dispose (object);
}