[gtk+/wip/baedert/gtkimageview: 84/150] GtkImageView: Free LoadTaskData correctly

[Timm Bäder <baedert src gnome org>]

commit 1c4ba62200785db1385ce5138eb66a48899c8b77
Author: Timm Bäder <mail baedert org>
Date:   Sun Jan 24 07:36:38 2016 +0100

    GtkImageView: Free LoadTaskData correctly

 gtk/gtkimageview.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkimageview.c b/gtk/gtkimageview.c
index bca9d3d..4b1c9cb 100644
--- a/gtk/gtkimageview.c
+++ b/gtk/gtkimageview.c
@@ -165,6 +165,7 @@ static void
 free_load_task_data (LoadTaskData *data)
 {
   g_clear_object (&data->source);
+  g_slice_free (LoadTaskData, data);
 }
 
 
@@ -1923,15 +1924,15 @@ gtk_image_view_load_image_from_stream (GtkImageView *image_view,
 {
   GdkPixbufAnimation *result;
 
-
   g_assert (error == NULL);
   result = gdk_pixbuf_animation_new_from_stream (G_INPUT_STREAM (input_stream),
                                                  cancellable,
                                                  &error);
 
-  g_object_unref (input_stream);
   if (!error)
     gtk_image_view_replace_animation (image_view, result, scale_factor);
+
+  g_object_unref (input_stream);
 }
 
 static void
@@ -1950,12 +1951,13 @@ gtk_image_view_load_image_contents (GTask        *task,
 
   if (error)
     {
-      g_slice_free (LoadTaskData, data);
+      g_object_unref (in_stream);
       g_task_return_error (task, error);
       return;
     }
 
 
+  /* Closes and unrefs the input stream */
   gtk_image_view_load_image_from_stream (image_view,
                                          G_INPUT_STREAM (in_stream),
                                          data->scale_factor,
@@ -1964,8 +1966,6 @@ gtk_image_view_load_image_contents (GTask        *task,
 
   if (error)
     g_task_return_error (task, error);
-
-  g_slice_free (LoadTaskData, data);
 }
 
 static void
@@ -1979,6 +1979,7 @@ gtk_image_view_load_from_input_stream (GTask        *task,
   GInputStream *in_stream = G_INPUT_STREAM (data->source);
   GError *error = NULL;
 
+  /* Closes and unrefs the input stream */
   gtk_image_view_load_image_from_stream (image_view,
                                          in_stream,
                                          data->scale_factor,
@@ -1987,8 +1988,6 @@ gtk_image_view_load_from_input_stream (GTask        *task,
 
   if (error)
     g_task_return_error (task, error);
-
-  g_slice_free (LoadTaskData, data);
 }