5 files changed, 11 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a187a6..7f516fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.10:
 *04/06/21:
+  * Fix and tidy KDE dockapps on [re]start (Simon)
+    - and don't listen to screen reconfigure sig anymore in toolbar
+    Screen.hh/cc Toolbar.cc fluxbox.cc
   * Fix autogrouping issue where windows wouldn't show (Simon)
     Workspace.cc
 *04/06/20:
diff --git a/src/Screen.cc b/src/Screen.cc
index f90b3dc..14a701f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.282 2004/06/19 15:04:27 rathnor Exp $
+// $Id: Screen.cc,v 1.283 2004/06/21 15:23:41 rathnor Exp $
 
 
 #include "Screen.hh"
@@ -1098,28 +1098,6 @@ bool BScreen::addKdeDockapp(Window client) {
     return true;
 }
 
-void BScreen::setupKdeDockapps() {
-#ifdef SLIT
-    if (slit() == 0)
-        return;
-    // kde dockapps end up in the slit at start
-    Slit::SlitClients::iterator it = slit()->clients().begin();
-    Slit::SlitClients::iterator it_end = slit()->clients().end();
-    std::list<Window> winlist;
-    for (; it != it_end; ++it) {
-        if (isKdeDockapp((*it)->window())) {
-            winlist.push_back((*it)->window());
-            slit()->removeClient((*it)->window());
-        }
-    }
-    std::list<Window>::iterator win_it = winlist.begin();
-    std::list<Window>::iterator win_it_end = winlist.end();
-    for (; win_it != win_it_end; ++win_it) {
-        createWindow(*win_it);
-    }
-#endif // SLIT    
-}
-
 FluxboxWindow *BScreen::createWindow(Window client) {
     FbTk::App::instance()->sync(false);
 
diff --git a/src/Screen.hh b/src/Screen.hh
index 8c74e44..26938df 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.141 2004/05/02 21:10:30 fluxgen Exp $
+// $Id: Screen.hh,v 1.142 2004/06/21 15:23:42 rathnor Exp $
 
 #ifndef  SCREEN_HH
 #define  SCREEN_HH
@@ -145,7 +145,6 @@ public:
     bool isKdeDockapp(Window win) const;
     /// @return true if dock app was added, else false
     bool addKdeDockapp(Window win);
-    void setupKdeDockapps();
 
     inline unsigned int width() const { return rootWindow().width(); }
     inline unsigned int height() const { return rootWindow().height(); }
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index c72e54c..2a39ec0 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.145 2004/06/20 10:29:51 rathnor Exp $
+// $Id: Toolbar.cc,v 1.146 2004/06/21 15:23:42 rathnor Exp $
 
 #include "Toolbar.hh"
 
@@ -230,7 +230,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
     m_theme.reconfigSig().attach(this);
     // listen to screen size changes
     screen().resizeSig().attach(this);
-    screen().reconfigureSig().attach(this); // if alpha value changes
 
     moveToLayer((*m_rc_layernum).getNum());
 
@@ -267,7 +266,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
     // setup to listen to child events
     FbTk::EventManager::instance()->addParent(*this, window());
     // get everything together
-    //reconfigure(); 
+    reconfigure(); 
     // this gets done by the screen later as it loads
 
 }
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 37b06e0..3a93962 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.244 2004/06/13 11:01:47 fluxgen Exp $
+// $Id: fluxbox.cc,v 1.245 2004/06/21 15:23:42 rathnor Exp $
 
 #include "fluxbox.hh"
 
@@ -540,7 +540,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
 
         // now we can create menus (which needs this screen to be in screen_list)
         screen->initMenus();
-        screen->initWindows();
 
 #ifdef HAVE_GETPID
         pid_t bpid = getpid();
@@ -569,8 +568,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
                                          *screen->layerManager().
                                          getLayer(Fluxbox::instance()->getNormalLayer())));
 #endif // USE_TOOLBAR
-        // must do this after systray is created
-        screen->setupKdeDockapps();
+
+        // must do this after toolbar is created
+        screen->initWindows();
 
         // attach screen signals to this
         screen->currentWorkspaceSig().attach(this);