diff options
author | rathnor <rathnor> | 2004-06-21 15:23:42 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-06-21 15:23:42 (GMT) |
commit | 965086f39d807fc83b6b2605b7858a9baa9ee2f0 (patch) | |
tree | c19745edf475b209b2c5c06b04812062276e4269 /src/fluxbox.cc | |
parent | 6a51cefb2f67c041f19cbb3842adb81ff54b4771 (diff) | |
download | fluxbox_pavel-965086f39d807fc83b6b2605b7858a9baa9ee2f0.zip fluxbox_pavel-965086f39d807fc83b6b2605b7858a9baa9ee2f0.tar.bz2 |
tidying up initialisation with dockapps
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.cc,v 1.244 2004/06/13 11:01:47 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.245 2004/06/21 15:23:42 rathnor Exp $ |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | 28 | ||
@@ -540,7 +540,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
540 | 540 | ||
541 | // now we can create menus (which needs this screen to be in screen_list) | 541 | // now we can create menus (which needs this screen to be in screen_list) |
542 | screen->initMenus(); | 542 | screen->initMenus(); |
543 | screen->initWindows(); | ||
544 | 543 | ||
545 | #ifdef HAVE_GETPID | 544 | #ifdef HAVE_GETPID |
546 | pid_t bpid = getpid(); | 545 | pid_t bpid = getpid(); |
@@ -569,8 +568,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
569 | *screen->layerManager(). | 568 | *screen->layerManager(). |
570 | getLayer(Fluxbox::instance()->getNormalLayer()))); | 569 | getLayer(Fluxbox::instance()->getNormalLayer()))); |
571 | #endif // USE_TOOLBAR | 570 | #endif // USE_TOOLBAR |
572 | // must do this after systray is created | 571 | |
573 | screen->setupKdeDockapps(); | 572 | // must do this after toolbar is created |
573 | screen->initWindows(); | ||
574 | 574 | ||
575 | // attach screen signals to this | 575 | // attach screen signals to this |
576 | screen->currentWorkspaceSig().attach(this); | 576 | screen->currentWorkspaceSig().attach(this); |