From 018c353d0ba15fb01880d09725295adddd56cbdd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Sep 2004 04:57:02 +0000 Subject: [PATCH] Don't leak the iter of a running animation. (#151542) Wed Sep 1 00:55:56 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter of a running animation. (#151542) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkimage.c | 5 +---- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea1ad78461..b40fded403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 1 00:55:56 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter + of a running animation. (#151542) + Tue Aug 31 23:40:29 2004 Matthias Clasen * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ea1ad78461..b40fded403 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Sep 1 00:55:56 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter + of a running animation. (#151542) + Tue Aug 31 23:40:29 2004 Matthias Clasen * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ea1ad78461..b40fded403 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Sep 1 00:55:56 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter + of a running animation. (#151542) + Tue Aug 31 23:40:29 2004 Matthias Clasen * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ea1ad78461..b40fded403 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Sep 1 00:55:56 2004 Matthias Clasen + + * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter + of a running animation. (#151542) + Tue Aug 31 23:40:29 2004 Matthias Clasen * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index fc35c5c70e..8d8b54ad3a 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1610,13 +1610,10 @@ gtk_image_clear (GtkImage *image) break; case GTK_IMAGE_ANIMATION: - if (image->data.anim.frame_timeout) - g_source_remove (image->data.anim.frame_timeout); + gtk_image_reset_anim_iter (image); if (image->data.anim.anim) g_object_unref (image->data.anim.anim); - - image->data.anim.frame_timeout = 0; image->data.anim.anim = NULL; g_object_notify (G_OBJECT (image), "pixbuf_animation");