Updating branch refs/heads/master
to 2ec7c01f9debd21e4f41280d57361acbe29d10e7 (commit)
from 0d04763d81cc9665fd22eda65944a73828838ac6 (commit)
commit 2ec7c01f9debd21e4f41280d57361acbe29d10e7
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Sat Sep 12 04:02:58 2009 +0200
Fix two memory leaks. Cleanup indentations.
.../pixbuf-thumbnailer-provider.c | 3 +++
tumbler/tumbler-file-info.c | 2 ++
tumblerd/tumbler-registry.c | 3 +--
tumblerd/tumbler-threshold-scheduler.c | 7 +++----
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index b0db39c..49b6b2d 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -160,6 +160,9 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
"uri-schemes", uri_schemes, "mime-types",
mime_types,
NULL);
+ /* free MIME types */
+ g_strfreev (mime_types);
+
/* add the thumbnailer to the list */
thumbnailers = g_list_append (thumbnailers, thumbnailer);
diff --git a/tumbler/tumbler-file-info.c b/tumbler/tumbler-file-info.c
index 7372bb2..80b8d69 100644
--- a/tumbler/tumbler-file-info.c
+++ b/tumbler/tumbler-file-info.c
@@ -123,6 +123,8 @@ tumbler_file_info_finalize (GObject *object)
g_list_foreach (info->thumbnails, (GFunc) g_object_unref, NULL);
g_list_free (info->thumbnails);
+ g_free (info->uri);
+
(*G_OBJECT_CLASS (tumbler_file_info_parent_class)->finalize) (object);
}
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index 5203fde..b35b8a7 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -99,8 +99,7 @@ tumbler_registry_init (TumblerRegistry *registry)
{
registry->mutex = g_mutex_new ();
registry->thumbnailers = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free,
-
tumbler_registry_list_free);
+ g_free,
tumbler_registry_list_free);
}
diff --git a/tumblerd/tumbler-threshold-scheduler.c
b/tumblerd/tumbler-threshold-scheduler.c
index 82077b5..3cda6cf 100644
--- a/tumblerd/tumbler-threshold-scheduler.c
+++ b/tumblerd/tumbler-threshold-scheduler.c
@@ -144,7 +144,7 @@ tumbler_threshold_scheduler_init (TumblerThresholdScheduler
*scheduler)
/* allocate a pool with max. 2 threads for request with <= threshold URIs */
scheduler->small_pool = g_thread_pool_new
(tumbler_threshold_scheduler_thread,
- scheduler, 2, TRUE, NULL);
+ scheduler, 2, TRUE, NULL);
/* make the thread a LIFO */
g_thread_pool_set_sort_function (scheduler->small_pool,
@@ -152,7 +152,7 @@ tumbler_threshold_scheduler_init (TumblerThresholdScheduler
*scheduler)
/* allocate a pool with max. 2 threads for request with > threshold URIs */
scheduler->large_pool = g_thread_pool_new
(tumbler_threshold_scheduler_thread,
- scheduler, 2, TRUE, NULL);
+ scheduler, 2, TRUE, NULL);
/* make the thread a LIFO */
g_thread_pool_set_sort_function (scheduler->small_pool,
@@ -171,8 +171,7 @@ tumbler_threshold_scheduler_finalize (GObject *object)
g_thread_pool_free (scheduler->large_pool, TRUE, TRUE);
/* release all pending requests */
- g_list_foreach (scheduler->requests, (GFunc) tumbler_scheduler_request_free,
- NULL);
+ g_list_foreach (scheduler->requests, (GFunc) tumbler_scheduler_request_free,
NULL);
/* destroy the request list */
g_list_free (scheduler->requests);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
