From db002b568670977364db48a89ca116804de01925 Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Sun, 22 Jul 2007 19:50:09 +0000
Subject: more cleanup

---
 src/FbTk/ImageImlib2.cc | 4 ++--
 src/FbTk/KeyUtil.cc     | 2 +-
 src/MenuCreator.cc      | 2 +-
 src/Screen.cc           | 2 ++
 src/Slit.cc             | 2 --
 src/fluxbox.cc          | 2 +-
 src/fluxbox.hh          | 2 +-
 7 files changed, 8 insertions(+), 8 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);
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 16acfb8..b425d41 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -523,7 +523,7 @@ FbTk::Menu *MenuCreator::createMenuType(const string &type, int screen_num) {
         menu->disableTitle(); // not titlebar
         if (screen->windowMenuFilename().empty() ||
             ! createWindowMenuFromFile(screen->windowMenuFilename(), *menu, true)) {
-            char *default_menu[] = {
+            const char *default_menu[] = {
                 "shade",
                 "stick",
                 "maximize",
diff --git a/src/Screen.cc b/src/Screen.cc
index e89db09..d843a53 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1296,6 +1296,8 @@ void BScreen::changeWorkspaceID(unsigned int id) {
 
     FbTk::App::instance()->sync(false);
 
+    m_currentworkspace_sig.notify();
+
 }
 
 
diff --git a/src/Slit.cc b/src/Slit.cc
index c0ff1ac..b18dddc 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -59,7 +59,6 @@
 #include "SlitTheme.hh"
 #include "SlitClient.hh"
 #include "Xutil.hh"
-#include "FbAtoms.hh"
 #include "FbTk/App.hh"
 #include "FbTk/MenuSeparator.hh"
 #include "FbTk/StringUtil.hh"
@@ -497,7 +496,6 @@ void Slit::addClient(Window w) {
 
     Atom *proto = 0;
     int num_return = 0;
-    FbAtoms *fbatoms = FbAtoms::instance();
 
     if (XGetWMProtocols(disp, w, &proto, &num_return)) {
 
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 803f911..248c897 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1404,7 +1404,7 @@ string Fluxbox::getRcFilename() {
 }
 
 /// Provides default filename of data file
-void Fluxbox::getDefaultDataFilename(char *name, string &filename) {
+void Fluxbox::getDefaultDataFilename(const char *name, string &filename) const {
     filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
 }
 
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 2cd8ef3..625a906 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -196,7 +196,7 @@ public:
     bool menuTimestampsChanged() const;
     bool haveShape() const { return m_have_shape; }
     int shapeEventbase() const { return m_shape_eventbase; }
-    void getDefaultDataFilename(char *name, std::string &);
+    void getDefaultDataFilename(const char *name, std::string &) const;
     // screen mouse was in at last key event
     BScreen *mouseScreen() { return m_mousescreen; }
     // screen of window that last key event (i.e. focused window) went to
-- 
cgit v0.11.2