aboutsummaryrefslogtreecommitdiff
path: root/src/Remember.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Remember.cc')
-rw-r--r--src/Remember.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index c010d07..544fed8 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -635,7 +635,9 @@ Remember::Remember():
635 enableUpdate(); 635 enableUpdate();
636 636
637 m_reloader->setReloadCmd(FbTk::RefCount<FbTk::Command<void> >(new FbTk::SimpleCommand<Remember>(*this, &Remember::reload))); 637 m_reloader->setReloadCmd(FbTk::RefCount<FbTk::Command<void> >(new FbTk::SimpleCommand<Remember>(*this, &Remember::reload)));
638 reconfigure(); 638 m_reloader->setMainFile(*Fluxbox::instance()->getAppsResource());
639 join(Fluxbox::instance()->getAppsResource().modifiedSig(),
640 FbTk::MemFun(*m_reloader, &FbTk::AutoReloadHelper::setMainFile));
639} 641}
640 642
641Remember::~Remember() { 643Remember::~Remember() {
@@ -702,19 +704,12 @@ Application * Remember::add(WinClient &winclient) {
702 return app; 704 return app;
703} 705}
704 706
705
706
707
708void Remember::reconfigure() {
709 m_reloader->setMainFile(Fluxbox::instance()->getAppsFilename());
710}
711
712void Remember::checkReload() { 707void Remember::checkReload() {
713 m_reloader->checkReload(); 708 m_reloader->checkReload();
714} 709}
715 710
716void Remember::reload() { 711void Remember::reload() {
717 string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename()); 712 const string &apps_string = FbTk::StringUtil::expandFilename(*Fluxbox::instance()->getAppsResource());
718 713
719 714
720 fbdbg<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl; 715 fbdbg<<"("<<__FUNCTION__<<"): Loading apps file ["<<apps_string<<"]"<<endl;
@@ -860,7 +855,7 @@ void Remember::reload() {
860 855
861void Remember::save() { 856void Remember::save() {
862 857
863 string apps_string = FbTk::StringUtil::expandFilename(Fluxbox::instance()->getAppsFilename()); 858 const string &apps_string = FbTk::StringUtil::expandFilename(*Fluxbox::instance()->getAppsResource());
864 859
865 fbdbg<<"("<<__FUNCTION__<<"): Saving apps file ["<<apps_string<<"]"<<endl; 860 fbdbg<<"("<<__FUNCTION__<<"): Saving apps file ["<<apps_string<<"]"<<endl;
866 861
@@ -1036,7 +1031,7 @@ void Remember::save() {
1036 } 1031 }
1037 apps_file.close(); 1032 apps_file.close();
1038 // update timestamp to avoid unnecessary reload 1033 // update timestamp to avoid unnecessary reload
1039 m_reloader->addFile(Fluxbox::instance()->getAppsFilename()); 1034 m_reloader->addFile(*Fluxbox::instance()->getAppsResource());
1040} 1035}
1041 1036
1042bool Remember::isRemembered(WinClient &winclient, Attribute attrib) { 1037bool Remember::isRemembered(WinClient &winclient, Attribute attrib) {