diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-12 16:30:13 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-12 16:30:13 (GMT) |
commit | a56492c0d538c9c3a019812558938df0b6afedeb (patch) | |
tree | 1e3e349d3d074fa51496463df8821c66009ed54a | |
parent | 0b2e002d4f281edfef0e6c036cf58d9fdb7ae978 (diff) | |
download | fluxbox-a56492c0d538c9c3a019812558938df0b6afedeb.zip fluxbox-a56492c0d538c9c3a019812558938df0b6afedeb.tar.bz2 |
some minor changes
-rw-r--r-- | src/Remember.cc | 9 | ||||
-rw-r--r-- | src/Remember.hh | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Remember.cc b/src/Remember.cc index 825a070..2bd691f 100644 --- a/src/Remember.cc +++ b/src/Remember.cc | |||
@@ -120,7 +120,7 @@ public: | |||
120 | 120 | ||
121 | void click(int button, int time, unsigned int mods) { | 121 | void click(int button, int time, unsigned int mods) { |
122 | // reconfigure only does stuff if the apps file has changed | 122 | // reconfigure only does stuff if the apps file has changed |
123 | Remember::instance().reconfigure(); | 123 | Remember::instance().checkReload(); |
124 | if (WindowCmd<void>::window() != 0) { | 124 | if (WindowCmd<void>::window() != 0) { |
125 | if (isSelected()) { | 125 | if (isSelected()) { |
126 | Remember::instance().forgetAttrib(WindowCmd<void>::window()->winClient(), m_attrib); | 126 | Remember::instance().forgetAttrib(WindowCmd<void>::window()->winClient(), m_attrib); |
@@ -580,6 +580,9 @@ Application *Remember::findMatchingPatterns(ClientPattern *pat, Patterns *patlis | |||
580 | 580 | ||
581 | void Remember::reconfigure() { | 581 | void Remember::reconfigure() { |
582 | m_reloader.setMainFile(Fluxbox::instance()->getAppsFilename()); | 582 | m_reloader.setMainFile(Fluxbox::instance()->getAppsFilename()); |
583 | } | ||
584 | |||
585 | void Remember::checkReload() { | ||
583 | m_reloader.checkReload(); | 586 | m_reloader.checkReload(); |
584 | } | 587 | } |
585 | 588 | ||
@@ -1214,7 +1217,7 @@ void Remember::setupClient(WinClient &winclient) { | |||
1214 | return; | 1217 | return; |
1215 | 1218 | ||
1216 | // check if apps file has changed | 1219 | // check if apps file has changed |
1217 | reconfigure(); | 1220 | checkReload(); |
1218 | 1221 | ||
1219 | Application *app = find(winclient); | 1222 | Application *app = find(winclient); |
1220 | if (app == 0) | 1223 | if (app == 0) |
@@ -1249,7 +1252,7 @@ FluxboxWindow *Remember::findGroup(Application *app, BScreen &screen) { | |||
1249 | } | 1252 | } |
1250 | 1253 | ||
1251 | void Remember::updateClientClose(WinClient &winclient) { | 1254 | void Remember::updateClientClose(WinClient &winclient) { |
1252 | reconfigure(); // reload if it's changed | 1255 | checkReload(); // reload if it's changed |
1253 | Application *app = find(winclient); | 1256 | Application *app = find(winclient); |
1254 | 1257 | ||
1255 | if (app && (app->save_on_close_remember && app->save_on_close)) { | 1258 | if (app && (app->save_on_close_remember && app->save_on_close)) { |
diff --git a/src/Remember.hh b/src/Remember.hh index 107f1d2..1f3ed7f 100644 --- a/src/Remember.hh +++ b/src/Remember.hh | |||
@@ -225,6 +225,7 @@ public: | |||
225 | FluxboxWindow* findGroup(Application *, BScreen &screen); | 225 | FluxboxWindow* findGroup(Application *, BScreen &screen); |
226 | 226 | ||
227 | void reconfigure(); | 227 | void reconfigure(); |
228 | void checkReload(); | ||
228 | void reload(); | 229 | void reload(); |
229 | void save(); | 230 | void save(); |
230 | 231 | ||