[Pkg-xfce-commits] r6098 - in goodies/trunk/ristretto/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-06 20:23:10 +0000 (Thu, 06 Oct 2011)
New Revision: 6098

Removed:
   goodies/trunk/ristretto/debian/patches/01_fix-various-memleaks.patch
   goodies/trunk/ristretto/debian/patches/series
Modified:
   goodies/trunk/ristretto/debian/changelog
Log:
* debian/patches:
  - 01_fix-various-memleaks dropped, included upstream.

Modified: goodies/trunk/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog	2011-10-06 20:22:11 UTC (rev 6097)
+++ goodies/trunk/ristretto/debian/changelog	2011-10-06 20:23:10 UTC (rev 6098)
@@ -1,6 +1,8 @@
 ristretto (0.1.0-1) UNRELEASED; urgency=low
 
   * New upstream releaase.
+  * debian/patches:
+    - 01_fix-various-memleaks dropped, included upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 06 Oct 2011 22:22:07 +0200
 

Deleted: goodies/trunk/ristretto/debian/patches/01_fix-various-memleaks.patch
===================================================================
--- goodies/trunk/ristretto/debian/patches/01_fix-various-memleaks.patch	2011-10-06 20:22:11 UTC (rev 6097)
+++ goodies/trunk/ristretto/debian/patches/01_fix-various-memleaks.patch	2011-10-06 20:23:10 UTC (rev 6098)
@@ -1,69 +0,0 @@
-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(-)
-
-Index: ristretto-0.0.93/src/image.c
-===================================================================
---- ristretto-0.0.93.orig/src/image.c	2011-02-28 19:45:44.000000000 +0100
-+++ ristretto-0.0.93/src/image.c	2011-09-02 22:23:05.000000000 +0200
-@@ -639,6 +639,7 @@
-         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 @@
-         {
-             /* 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 @@
-         {
-             /* 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);
-         }
-@@ -722,6 +725,19 @@
- 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)
-Index: ristretto-0.0.93/src/image_list.c
-===================================================================
---- ristretto-0.0.93.orig/src/image_list.c	2011-02-28 20:52:54.000000000 +0100
-+++ ristretto-0.0.93/src/image_list.c	2011-09-02 22:23:05.000000000 +0200
-@@ -269,6 +269,7 @@
-                 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);

Deleted: goodies/trunk/ristretto/debian/patches/series
===================================================================
--- goodies/trunk/ristretto/debian/patches/series	2011-10-06 20:22:11 UTC (rev 6097)
+++ goodies/trunk/ristretto/debian/patches/series	2011-10-06 20:23:10 UTC (rev 6098)
@@ -1 +0,0 @@
-01_fix-various-memleaks.patch