summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--THANKS1
-rw-r--r--configure.in2
-rw-r--r--help/nautilus-screenshot-guidelines/.cvsignore2
-rw-r--r--help/nautilus-screenshot-guidelines/C/.cvsignore5
5 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd9cc9f8d..593dbbe99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2001-04-26 Darin Adler <darin@eazel.com>
+ * THANKS: Give Alex Larsson credit for his contribution.
+
+ * configure.in: Added the screenshot directory. Updated the check
+ for control center to check for libcapplet instead. Chris Lahey
+ told me that Ximian did this in the version they released, so I
+ figured I should do it here too.
+`
+ * help/nautilus-screenshot-guidelines/.cvsignore:
+ * help/nautilus-screenshot-guidelines/C/.cvsignore:
+ Ignore more generated files.
+
+2001-04-26 Darin Adler <darin@eazel.com>
+
Integrated a patch by Alexander Larsson <alla@lysator.liu.se> that
adds a JPEG-specific thumbnailing function that's faster than the
exiting thumbnail code. This new code is only included if the
diff --git a/THANKS b/THANKS
index 535d6fab7..1f811939d 100644
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,6 @@
The Nautilus team would like to thank the following contributors:
+Alexander Larsson <alla@lysator.liu.se> - faster thumbnailing for JPEGs
Anders Carlsson <andersca@gnu.org> - background drawing optimizations
Arik Devens <arik@eazel.com> - bug fixes
Brian Frank <bfrank@eazel.com> - fixes to default bookmarks, product marketing
diff --git a/configure.in b/configure.in
index 0dc976c21..d8789bb69 100644
--- a/configure.in
+++ b/configure.in
@@ -540,7 +540,7 @@ AC_CHECK_FUNCS(gnome_canvas_set_dither)
LIBS="$_libs"
dnl control center
-EAZEL_VERSION_INSIST(control-center, gnomecc --version | awk '{print $3}', >=, CONTROL_CENTER_REQUIRED)
+EAZEL_VERSION_INSIST(control-center, $GNOME_CONFIG --modversion capplet | awk '{print $2}', >=, CONTROL_CENTER_REQUIRED)
dnl Bonobo
EAZEL_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED)
diff --git a/help/nautilus-screenshot-guidelines/.cvsignore b/help/nautilus-screenshot-guidelines/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/help/nautilus-screenshot-guidelines/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/help/nautilus-screenshot-guidelines/C/.cvsignore b/help/nautilus-screenshot-guidelines/C/.cvsignore
new file mode 100644
index 000000000..4dbd4f5c7
--- /dev/null
+++ b/help/nautilus-screenshot-guidelines/C/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+index.html
+nautilus-screenshot-guidelines
+omf_timestamp