summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-01-08 16:47:27 (GMT)
committermarkt <markt>2007-01-08 16:47:27 (GMT)
commit4390fb34e0941b74c08558cb94f3ab40ecc9b5d9 (patch)
tree1efd2cec8bd0d8115bd7152f9d6d44ba0c3b9e59
parent8c98b9e999c5865237a5c8cce7d001f96015ca78 (diff)
downloadfluxbox_lack-4390fb34e0941b74c08558cb94f3ab40ecc9b5d9.zip
fluxbox_lack-4390fb34e0941b74c08558cb94f3ab40ecc9b5d9.tar.bz2
fixed _NET_WM_DESKTOP regression
-rw-r--r--src/fluxbox.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 723c6e0..e492fb5 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -313,14 +313,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
313 313
314 load_rc(); 314 load_rc();
315 315
316 // setup atom handlers before we create any windows
317#ifdef USE_NEWWMSPEC
318 addAtomHandler(new Ewmh(), "ewmh"); // for Extended window manager atom support
319#endif // USE_NEWWMSPEC
320#ifdef USE_GNOME
321 addAtomHandler(new Gnome(), "gnome"); // for gnome 1 atom support
322#endif //USE_GNOME
323
324 grab(); 316 grab();
325 317
326 setupConfigFiles(); 318 setupConfigFiles();
@@ -410,6 +402,15 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
410#ifdef REMEMBER 402#ifdef REMEMBER
411 addAtomHandler(new Remember(), "remember"); // for remembering window attribs 403 addAtomHandler(new Remember(), "remember"); // for remembering window attribs
412#endif // REMEMBER 404#endif // REMEMBER
405 // ewmh handler needs to be added after apps file handler, or else some
406 // window properties are set incorrectly on new windows
407 // this dependency should probably be made more robust
408#ifdef USE_NEWWMSPEC
409 addAtomHandler(new Ewmh(), "ewmh"); // for Extended window manager atom support
410#endif // USE_NEWWMSPEC
411#ifdef USE_GNOME
412 addAtomHandler(new Gnome(), "gnome"); // for gnome 1 atom support
413#endif //USE_GNOME
413 414
414 // init all "screens" 415 // init all "screens"
415 ScreenList::iterator it = m_screen_list.begin(); 416 ScreenList::iterator it = m_screen_list.begin();