diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index dd371ee..ee93883 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.174 2003/07/23 10:43:30 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.175 2003/07/27 13:53:34 fluxgen Exp $ |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | 28 | ||
@@ -423,14 +423,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
423 | m_server_grabs(0), | 423 | m_server_grabs(0), |
424 | m_randr_event_type(0), | 424 | m_randr_event_type(0), |
425 | m_RC_PATH("fluxbox"), | 425 | m_RC_PATH("fluxbox"), |
426 | m_RC_INIT_FILE("init"), | 426 | m_RC_INIT_FILE("init") { |
427 | // For KDE dock applets | ||
428 | // KDE v1.x | ||
429 | m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), | ||
430 | "KWM_DOCKWINDOW", False)), | ||
431 | // KDE v2.x | ||
432 | m_kwm2_dockwindow(XInternAtom(FbTk::App::instance()->display(), | ||
433 | "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False)) { | ||
434 | 427 | ||
435 | 428 | ||
436 | if (s_singleton != 0) | 429 | if (s_singleton != 0) |
@@ -441,7 +434,13 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
441 | throw string("Can not connect to X server.\n" | 434 | throw string("Can not connect to X server.\n" |
442 | "Make sure you started X before you start Fluxbox."); | 435 | "Make sure you started X before you start Fluxbox."); |
443 | } | 436 | } |
444 | 437 | // For KDE dock applets | |
438 | // KDE v1.x | ||
439 | m_kwm1_dockwindow = XInternAtom(FbTk::App::instance()->display(), | ||
440 | "KWM_DOCKWINDOW", False); | ||
441 | // KDE v2.x | ||
442 | m_kwm2_dockwindow = XInternAtom(FbTk::App::instance()->display(), | ||
443 | "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False); | ||
445 | // setup X error handler | 444 | // setup X error handler |
446 | XSetErrorHandler((XErrorHandler) handleXErrors); | 445 | XSetErrorHandler((XErrorHandler) handleXErrors); |
447 | 446 | ||