aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-16 08:50:59 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-16 08:50:59 (GMT)
commit4a7a143713c7febe7d3a7df9c044ed767b8bd3c6 (patch)
treef4d1f31c5167469f77408d42d6eca83a29d42b4c /src/fluxbox.cc
parent8516f1e2a21a374127ccfa3f7b8de2443e67fe33 (diff)
downloadfluxbox-4a7a143713c7febe7d3a7df9c044ed767b8bd3c6.zip
fluxbox-4a7a143713c7febe7d3a7df9c044ed767b8bd3c6.tar.bz2
load style before loading theme objects, remove duplicate theme load
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index d22f496..29b3509 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -318,6 +318,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
318#endif // HAVE_GETPID 318#endif // HAVE_GETPID
319 319
320 320
321 // setup theme manager to have our style file ready to be scanned
322 FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
323
321 // Create keybindings handler and load keys file 324 // Create keybindings handler and load keys file
322 // Note: this needs to be done before creating screens 325 // Note: this needs to be done before creating screens
323 m_key.reset(new Keys); 326 m_key.reset(new Keys);
@@ -410,9 +413,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
410 413
411 XAllowEvents(disp, ReplayPointer, CurrentTime); 414 XAllowEvents(disp, ReplayPointer, CurrentTime);
412 415
413 // setup theme manager to have our style file ready to be scanned
414 FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());
415
416 //XSynchronize(disp, False); 416 //XSynchronize(disp, False);
417 sync(false); 417 sync(false);
418 418