aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index a484434..f242f8c 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.251 2004/08/31 15:26:39 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.252 2004/09/08 16:50:42 akir Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -467,12 +467,13 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
467 467
468 FbTk::fontInit(); 468 FbTk::fontInit();
469 469
470 Display *disp = FbTk::App::instance()->display();
470 // For KDE dock applets 471 // For KDE dock applets
471 // KDE v1.x 472 // KDE v1.x
472 m_kwm1_dockwindow = XInternAtom(FbTk::App::instance()->display(), 473 m_kwm1_dockwindow = XInternAtom(disp,
473 "KWM_DOCKWINDOW", False); 474 "KWM_DOCKWINDOW", False);
474 // KDE v2.x 475 // KDE v2.x
475 m_kwm2_dockwindow = XInternAtom(FbTk::App::instance()->display(), 476 m_kwm2_dockwindow = XInternAtom(disp,
476 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False); 477 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False);
477 // setup X error handler 478 // setup X error handler
478 XSetErrorHandler((XErrorHandler) handleXErrors); 479 XSetErrorHandler((XErrorHandler) handleXErrors);
@@ -501,8 +502,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
501 m_reconfig_timer.setCommand(reconfig_cmd); 502 m_reconfig_timer.setCommand(reconfig_cmd);
502 m_reconfig_timer.fireOnce(true); 503 m_reconfig_timer.fireOnce(true);
503 504
504 Display *disp = FbTk::App::instance()->display();
505
506 s_singleton = this; 505 s_singleton = this;
507 m_have_shape = false; 506 m_have_shape = false;
508 m_shape_eventbase = 0; 507 m_shape_eventbase = 0;