[cheese] thumbview: fix a couple of memory leaks
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Subject: [cheese] thumbview: fix a couple of memory leaks
- Date: Sat, 16 May 2009 15:24:58 -0400 (EDT)
commit ba285816a41a26af2ed2351b584fac1da35df41d
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sat May 16 21:15:25 2009 +0200
thumbview: fix a couple of memory leaks
Fix a couple of trivial memory leaks in the thumbnail generator code.
Fixes bug #578289
---
src/cheese-thumb-view.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/cheese-thumb-view.c b/src/cheese-thumb-view.c
index d60a52e..fb22c21 100644
--- a/src/cheese-thumb-view.c
+++ b/src/cheese-thumb-view.c
@@ -165,6 +165,7 @@ cheese_thumb_view_thread_append_item (gpointer data)
g_free (mime_type);
g_free (filename);
g_object_unref (pixbuf);
+ g_object_unref (file);
g_free (item);
}
@@ -218,10 +219,6 @@ cheese_thumb_view_append_item (CheeseThumbView *thumb_view, GFile *file)
if (skip) return;
}
- data = g_new0 (CheeseThumbViewThreadData, 1);
- data->thumb_view = g_object_ref (thumb_view);
- data->file = g_object_ref (file);
-
if (priv->multiplex_thumbnail_generator)
{
char *f;
@@ -251,7 +248,6 @@ cheese_thumb_view_append_item (CheeseThumbView *thumb_view, GFile *file)
basename = g_path_get_basename (filename);
gtk_list_store_append (priv->store, &iter);
- data->iter = iter;
gtk_list_store_set (priv->store, &iter,
THUMBNAIL_PIXBUF_COLUMN, pixbuf,
THUMBNAIL_URL_COLUMN, filename,
@@ -266,6 +262,11 @@ cheese_thumb_view_append_item (CheeseThumbView *thumb_view, GFile *file)
if (!priv->multiplex_thumbnail_generator)
{
+ data = g_new0 (CheeseThumbViewThreadData, 1);
+ data->thumb_view = g_object_ref (thumb_view);
+ data->file = g_object_ref (file);
+ data->iter = iter;
+
if (!g_thread_create ((GThreadFunc) cheese_thumb_view_thread_append_item,
data, FALSE, &error))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]