diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2009-03-04 19:12:25 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2009-03-04 19:12:25 (GMT) |
commit | c4d8e9c8e14e1632708ef2d3c8d093099c5e3895 (patch) | |
tree | 8685498ab1d3de7a348393f8c42f825e610278aa | |
parent | f3bd0455f0183ee99f6ad2417ac675bc23c5f114 (diff) | |
download | fluxbox-c4d8e9c8e14e1632708ef2d3c8d093099c5e3895.zip fluxbox-c4d8e9c8e14e1632708ef2d3c8d093099c5e3895.tar.bz2 |
buildfix: fluxbox didnt link when configured with --disable-remember
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/Window.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6861506..1ed1c68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -84,8 +84,7 @@ if GNOME | |||
84 | gnome_SOURCE= Gnome.hh Gnome.cc | 84 | gnome_SOURCE= Gnome.hh Gnome.cc |
85 | endif | 85 | endif |
86 | if REMEMBER_SRC | 86 | if REMEMBER_SRC |
87 | REMEMBER_SOURCE= Remember.hh Remember.cc \ | 87 | REMEMBER_SOURCE= Remember.hh Remember.cc |
88 | ClientPattern.hh ClientPattern.cc | ||
89 | endif | 88 | endif |
90 | if TOOLBAR_SRC | 89 | if TOOLBAR_SRC |
91 | TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \ | 90 | TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \ |
@@ -132,6 +131,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
132 | RootCmdMenuItem.hh RootCmdMenuItem.cc\ | 131 | RootCmdMenuItem.hh RootCmdMenuItem.cc\ |
133 | MenuCreator.hh MenuCreator.cc \ | 132 | MenuCreator.hh MenuCreator.cc \ |
134 | ClientMenu.hh ClientMenu.cc \ | 133 | ClientMenu.hh ClientMenu.cc \ |
134 | ClientPattern.hh ClientPattern.cc \ | ||
135 | WorkspaceMenu.hh WorkspaceMenu.cc \ | 135 | WorkspaceMenu.hh WorkspaceMenu.cc \ |
136 | FocusModelMenuItem.hh \ | 136 | FocusModelMenuItem.hh \ |
137 | ToggleMenu.hh \ | 137 | ToggleMenu.hh \ |
diff --git a/src/Window.cc b/src/Window.cc index 4b4d1dc..edc2b8e 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -36,7 +36,9 @@ | |||
36 | #include "WinButton.hh" | 36 | #include "WinButton.hh" |
37 | #include "WinButtonTheme.hh" | 37 | #include "WinButtonTheme.hh" |
38 | #include "WindowCmd.hh" | 38 | #include "WindowCmd.hh" |
39 | #ifdef REMEMBER | ||
39 | #include "Remember.hh" | 40 | #include "Remember.hh" |
41 | #endif | ||
40 | #include "MenuCreator.hh" | 42 | #include "MenuCreator.hh" |
41 | #include "FocusControl.hh" | 43 | #include "FocusControl.hh" |
42 | #include "IconButton.hh" | 44 | #include "IconButton.hh" |
@@ -2190,9 +2192,11 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) { | |||
2190 | } else if (atom == fbatoms->getMWMHintsAtom()) { | 2192 | } else if (atom == fbatoms->getMWMHintsAtom()) { |
2191 | client.updateMWMHints(); | 2193 | client.updateMWMHints(); |
2192 | updateMWMHintsFromClient(client); | 2194 | updateMWMHintsFromClient(client); |
2195 | #ifdef REMEMBER | ||
2193 | if (!m_toggled_decos) { | 2196 | if (!m_toggled_decos) { |
2194 | Remember::instance().updateDecoStateFromClient(client); | 2197 | Remember::instance().updateDecoStateFromClient(client); |
2195 | } | 2198 | } |
2199 | #endif | ||
2196 | applyDecorations(); // update decorations (if they changed) | 2200 | applyDecorations(); // update decorations (if they changed) |
2197 | } | 2201 | } |
2198 | break; | 2202 | break; |