fix ToggleDecor for fullscreen and decorationless windows, plus some other cleanup

2 files changed, 3 insertions, 3 deletions

diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc
index 2d3ff6c..b4ef415 100644
--- a/src/FbTk/ImageImlib2.cc
+++ b/src/FbTk/ImageImlib2.cc
@@ -52,7 +52,7 @@ ImageImlib2::ImageImlib2() {
 
     // TODO: this are the potential candidates,
     //       choose only sane ones. open for discussion
-    static char* format_list[] = {
+    static const char* format_list[] = {
         "PNG",                               // pngloader
         "JPEG", "JPG", "JFI", "JFIF",        // jpegloader
 //        "TIFF", "TIF",                       // tiffloader
@@ -67,7 +67,7 @@ ImageImlib2::ImageImlib2() {
         NULL
     };
 
-    char** format = NULL;
+    const char** format = NULL;
     for(format = format_list; *format != NULL; format++) {
         Image::registerType(*format, *this);
     }
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 1830dca..a6ca632 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -34,7 +34,7 @@
 namespace {
 
 struct t_modlist{
-    char *str;
+    const char *str;
     unsigned int mask;
     bool operator == (const char *modstr) const {
         return  (strcasecmp(str, modstr) == 0 && mask !=0);