diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-11 15:54:18 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-11 15:54:18 (GMT) |
commit | a9fd0f5b26860c2227ac6169039332a00e65cc01 (patch) | |
tree | 8c8b376931214bd22eddcfb9e9f4f4388f64e4ac /src/fluxbox.cc | |
parent | 518af23488b63ef8b3b57c2fabc195e38d685283 (diff) | |
download | fluxbox_pavel-a9fd0f5b26860c2227ac6169039332a00e65cc01.zip fluxbox_pavel-a9fd0f5b26860c2227ac6169039332a00e65cc01.tar.bz2 |
remove some more useless code
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 300d683..d765d3c 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -399,7 +399,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
399 | //XSynchronize(disp, False); | 399 | //XSynchronize(disp, False); |
400 | sync(false); | 400 | sync(false); |
401 | 401 | ||
402 | m_reconfigure_wait = m_reread_menu_wait = false; | 402 | m_reconfigure_wait = false; |
403 | 403 | ||
404 | m_resourcemanager.unlock(); | 404 | m_resourcemanager.unlock(); |
405 | ungrab(); | 405 | ungrab(); |
@@ -1484,28 +1484,15 @@ bool Fluxbox::menuTimestampsChanged() const { | |||
1484 | return false; | 1484 | return false; |
1485 | } | 1485 | } |
1486 | 1486 | ||
1487 | void Fluxbox::rereadMenu(bool show_after_reread) { | 1487 | void Fluxbox::rereadMenu() { |
1488 | m_reread_menu_wait = true; | ||
1489 | m_show_menu_after_reread = show_after_reread; | ||
1490 | m_reconfig_timer.start(); | ||
1491 | } | ||
1492 | |||
1493 | |||
1494 | void Fluxbox::real_rereadMenu() { | ||
1495 | |||
1496 | clearMenuFilenames(); | 1488 | clearMenuFilenames(); |
1497 | 1489 | ||
1498 | for_each(m_screen_list.begin(), | 1490 | for_each(m_screen_list.begin(), |
1499 | m_screen_list.end(), | 1491 | m_screen_list.end(), |
1500 | mem_fun(&BScreen::rereadMenu)); | 1492 | mem_fun(&BScreen::rereadMenu)); |
1501 | 1493 | ||
1502 | if(m_show_menu_after_reread) { | 1494 | FbCommands::ShowRootMenuCmd showcmd; |
1503 | 1495 | showcmd.execute(); | |
1504 | FbCommands::ShowRootMenuCmd showcmd; | ||
1505 | showcmd.execute(); | ||
1506 | |||
1507 | m_show_menu_after_reread = false; | ||
1508 | } | ||
1509 | } | 1496 | } |
1510 | 1497 | ||
1511 | void Fluxbox::saveMenuFilename(const char *filename) { | 1498 | void Fluxbox::saveMenuFilename(const char *filename) { |
@@ -1546,10 +1533,7 @@ void Fluxbox::timed_reconfigure() { | |||
1546 | if (m_reconfigure_wait) | 1533 | if (m_reconfigure_wait) |
1547 | real_reconfigure(); | 1534 | real_reconfigure(); |
1548 | 1535 | ||
1549 | if (m_reread_menu_wait) | 1536 | m_reconfigure_wait = false; |
1550 | real_rereadMenu(); | ||
1551 | |||
1552 | m_reconfigure_wait = m_reread_menu_wait = false; | ||
1553 | } | 1537 | } |
1554 | 1538 | ||
1555 | void Fluxbox::revertFocus() { | 1539 | void Fluxbox::revertFocus() { |