[ristretto] Fix two major memory leaks (bugzilla.xfce.org #7882)

[Christoph Wickert]

commit bfab38fee8f5709e7d1aaf080a45b858134230b6
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Aug 16 00:20:16 2011 +0200

    Fix two major memory leaks (bugzilla.xfce.org #7882)

 ristretto-0.0.93_memleak-fix.patch |  103 ++++++++++++++++++++++++++++++++++++
 ristretto.spec                     |    8 +++-
 2 files changed, 110 insertions(+), 1 deletions(-)
---
diff --git a/ristretto-0.0.93_memleak-fix.patch b/ristretto-0.0.93_memleak-fix.patch
new file mode 100644
index 0000000..a780b9c
--- /dev/null
+++ b/ristretto-0.0.93_memleak-fix.patch
@@ -0,0 +1,103 @@
+From 54035ac294a8544e41d0ec590ab0dbc0370e410b Mon Sep 17 00:00:00 2001
+From: Stephan Arts <stephan at xfce.org>
+Date: Thu, 11 Aug 2011 22:30:54 +0200
+Subject: [PATCH 1/3] Fix memory leak
+
+---
+ src/image.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/image.c b/src/image.c
+index 09fe562..987316d 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -639,6 +639,7 @@ cb_rstto_image_read_input_stream_ready (GObject *source_object, GAsyncResult *re
+         if(gdk_pixbuf_loader_write (image->priv->loader, (const guchar *)image->priv->buffer, read_bytes, &error) == FALSE)
+         {
+             g_input_stream_close (G_INPUT_STREAM (source_object), NULL, NULL);
++            g_object_unref (source_object);
+             g_object_unref (image);
+         }
+         else
+@@ -659,6 +660,7 @@ cb_rstto_image_read_input_stream_ready (GObject *source_object, GAsyncResult *re
+         {
+             /* OK */
+             g_input_stream_close (G_INPUT_STREAM (source_object), NULL, NULL);
++            g_object_unref (source_object);
+             gdk_pixbuf_loader_close (image->priv->loader, NULL);
+             g_object_unref (image);
+         }
+@@ -666,6 +668,7 @@ cb_rstto_image_read_input_stream_ready (GObject *source_object, GAsyncResult *re
+         {
+             /* I/O ERROR */
+             g_input_stream_close (G_INPUT_STREAM (source_object), NULL, NULL);
++            g_object_unref (source_object);
+             gdk_pixbuf_loader_close (image->priv->loader, NULL);
+             g_object_unref (image);
+         }
+-- 
+1.7.5.4
+
+
+From 8dfd7b9e3d455ccd76a454bd22472df1a06226d9 Mon Sep 17 00:00:00 2001
+From: Stephan Arts <stephan at xfce.org>
+Date: Sat, 6 Aug 2011 12:01:26 +0200
+Subject: [PATCH 2/3] Emit the 'iter-changed' signal when the image-list is
+ empty.
+
+---
+ src/image_list.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/image_list.c b/src/image_list.c
+index 7f7af18..1344f3c 100644
+--- a/src/image_list.c
++++ b/src/image_list.c
+@@ -269,6 +269,7 @@ rstto_image_list_remove_image (RsttoImageList *image_list, RsttoImage *image)
+                 if (rstto_image_list_iter_get_image (iter->data) == image)
+                 {
+                     ((RsttoImageListIter *)(iter->data))->priv->image = NULL;
++                    g_signal_emit (G_OBJECT (iter->data), rstto_image_list_iter_signals[RSTTO_IMAGE_LIST_ITER_SIGNAL_CHANGED], 0, NULL);
+                 }
+             }
+             iter = g_slist_next (iter);
+-- 
+1.7.5.4
+
+
+From 4ba20c52980d31f508369a6a2dff6a67bfa2bae1 Mon Sep 17 00:00:00 2001
+From: Stephan Arts <stephan at xfce.org>
+Date: Fri, 12 Aug 2011 08:02:34 +0200
+Subject: [PATCH 3/3] Free gtkanimationiter
+
+---
+ src/image.c |   13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/src/image.c b/src/image.c
+index 987316d..4ce323f 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -725,6 +725,19 @@ static void
+ cb_rstto_image_area_prepared (GdkPixbufLoader *loader, RsttoImage *image)
+ {
+     gint timeout = 0;
++
++    if (image->priv->animation)
++    {
++        g_object_unref (image->priv->animation);
++        image->priv->animation = NULL;
++    }
++
++    if (image->priv->iter)
++    {
++        g_object_unref (image->priv->iter);
++        image->priv->iter = NULL;
++    }
++
+     image->priv->animation = gdk_pixbuf_loader_get_animation (loader);
+     image->priv->iter = gdk_pixbuf_animation_get_iter (image->priv->animation, NULL);
+     if (image->priv->pixbuf)
+-- 
+1.7.5.4
+
diff --git a/ristretto.spec b/ristretto.spec
index 8e17719..a799bb7 100644
--- a/ristretto.spec
+++ b/ristretto.spec
@@ -6,7 +6,7 @@
 
 Name:           ristretto
 Version:        0.0.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Image-viewer for the Xfce desktop environment
 Summary(de):    Bildbetrachter für die Xfce Desktop-Umgebung
 
@@ -15,6 +15,8 @@ License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/ristretto/
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2
 Patch0:         ristretto-0.0.91-dsofix.patch
+# https://bugzilla.xfce.org/show_bug.cgi?id=7882
+Patch1:         ristretto-0.0.93_memleak-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4
@@ -37,6 +39,7 @@ Desktop-Umgebung.
 %prep
 %setup -q
 %patch0 -p1 -b .dsofix
+%patch1 -p1 -b .memleak-fix
 
 
 %build
@@ -90,6 +93,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Aug 16 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.93-2
+- Fix two major memory leaks (bugzilla.xfce.org #7882)
+
 * Thu Mar 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.93-1
 - Update to 0.0.93 (fixes #542141 and #679808)
 - No longer require xfce4-doc