[libgsf] Thumbnailer: fix problem with resource limiting.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Thumbnailer: fix problem with resource limiting.
- Date: Fri, 1 Jul 2011 17:52:40 +0000 (UTC)
commit 1db37f22e4edee23d6b6c703c2a08c8e97071de9
Author: Morten Welinder <terra gnome org>
Date: Fri Jul 1 13:52:10 2011 -0400
Thumbnailer: fix problem with resource limiting.
ChangeLog | 4 ++++
NEWS | 4 ++++
thumbnailer/main.c | 4 ++--
3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5b77ea7..72af024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-01 Morten Welinder <terra gnome org>
+
+ * thumbnailer/main.c (set_resource_limits): Fix conditional.
+
2011-05-21 Morten Welinder <terra gnome org>
* gsf-win32/gsf-output-win32.c (gsf_output_istream_set_error): Use
diff --git a/NEWS b/NEWS
index d7f1c69..1fa6fa3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
libgsf 1.14.22
+Damien Lespiau:
+ * Fix thumbnailer manual install problem.
+
Morten:
* Fix error messages on win32.
+ * Fix resource limiting in thumbnailer.
--------------------------------------------------------------------------
libgsf 1.14.21
diff --git a/thumbnailer/main.c b/thumbnailer/main.c
index 985fd36..59bd15e 100644
--- a/thumbnailer/main.c
+++ b/thumbnailer/main.c
@@ -38,7 +38,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
-#ifdef HAVE_SETRLIMI
+#ifdef HAVE_SETRLIMIT
#include <sys/resource.h>
#endif
@@ -250,7 +250,7 @@ read_thumbnail_and_write (const char *in_filename, const char *out_filename, int
static void
set_resource_limits (void)
{
-#ifdef HAVE_SETRLIMI
+#ifdef HAVE_SETRLIMIT
struct rlimit limit;
/* We call convert(1) from ImageMagick, which is especially scary when converting
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]