sync with bb-cvs

diff --git a/CHANGELOG.bsetbg b/CHANGELOG.bsetbg
index 7bc6023523365653f72d99934a2fdabbbd52ed3c..b4c842161ababf5a9d16b11f13f9955884eea40f 100644 (file)
--- a/CHANGELOG.bsetbg
+++ b/CHANGELOG.bsetbg
@@ -1,9 +1,6 @@
-2.0
-* complete rewrite.
-
 1.12
 * fixed a bug with the bsetroot code that prevented compound commands from
-  being executed properly.
+  being executed properly (only applies to 0.61.*).
 
 1.11
 * various bugfixes.
@@ -13,14 +10,14 @@
 * bsetbg is now completely sh compliant, and no longer uses bash.
 * removed internal default configuration in favor of:
 * added the ability to generate a config file on the fly if one doesn't already exist.
-* added support for -display to be passed to bsetroot. bsetbg now fully supports
+* added support for -display to be passed to bsetroot. bsetbg now fully supports 
   all of bsetroot's options.
 * made the error messages smart.
-* if one of the variables in the configuration file contains an error, bsetbg
-  will still work perfectly unless it is required to use the faulty variable (in
-  which case it tells you what you did wrong).
-* bsetbg will check for the existence of the specified image application in each
-  of its config variables.
+* if one of the variables in the configuration file contains an error, bsetbg will still
+  work perfectly unless it is required to use the faulty variable (in which case it 
+  tells you what you did wrong).
+* bsetbg will check for the existence of the specified image application in each of its
+  config variables.
 * massive cleanup and optimization.
 
 1.00
@@ -29,8 +26,7 @@
 * fixed stupid bugs.
 
 0.09
-* fixed a bug that caused a crash when bsetbg tried to read a filename
-  containing spaces.
+* fixed a bug that caused a crash when bsetbg tried to read a filename containing spaces.
 
 0.08 
 * rewrote info function to make it even smarter.
@@ -39,14 +35,12 @@
 * the end user hath spoken. bsetbg shall hereafter read configuration values
   from one file and one file only, ~/.bsetbgrc.
 * more error handling.
-* fixed a bug that caused a crash when an image was specified without any
-  arguments.
+* fixed a bug that caused a crash when an image was specified without any arguments.
 
 0.06
-* bsetbg no longer checks for a configuration file when passing arguments to
-  bsetroot.
-* fixed up the -app stuff so that you can specify what the fallback action will
-  be (-center, -tile, or -full).
+* bsetbg no longer checks for a configuration file when passing arguments to bsetroot.
+* fixed up the -app stuff so that you can specify what the fallback action will be 
+  (-center, -tile, or -full).
 * added values for qiv to the sample.config.
 * made -info a lot smarter than it used to be.
 * no more support for ~/.bsetbgrc. it caused uneeded complication.
@@ -59,4 +53,4 @@
 * added external configuration files.
 
 0.04
-* i don't remember back that far
+* i don't remember back that far
\ No newline at end of file

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 21cb3647ede4f4d0a97f32a2f8a92178fe0f2488..98a5bfd4e95b9c855afb4f93dad5dbde5bb1a12e 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -37,9 +37,11 @@ extern "C" {
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
-}
 
-#include <cctype>
+#ifdef    HAVE_CTYPE_H
+# include <ctype.h>
+#endif // HAVE_CTYPE_H
+}
 
 #include "../src/i18n.hh"
 #include "../src/GCCache.hh"
@@ -303,7 +305,7 @@ void bsetroot::gradient(void) {
 
   std::string::const_iterator it = grad.begin(), end = grad.end();
   for (; it != end; ++it)
-    descr += std::tolower(*it);
+    descr += tolower(*it);
 
   std::string::size_type pos;
   while ((pos = descr.find("raised")) != std::string::npos)