diff options
-rw-r--r-- | src/IconBar.cc | 4 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/Slit.cc | 4 | ||||
-rw-r--r-- | src/Toolbar.cc | 8 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/IconBar.cc b/src/IconBar.cc index c4fc437..e24ba32 100644 --- a/src/IconBar.cc +++ b/src/IconBar.cc | |||
@@ -19,11 +19,11 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: IconBar.cc,v 1.36 2003/05/15 23:30:06 fluxgen Exp $ | 22 | // $Id: IconBar.cc,v 1.37 2003/06/13 05:02:09 fluxgen Exp $ |
23 | 23 | ||
24 | #include "IconBar.hh" | 24 | #include "IconBar.hh" |
25 | 25 | ||
26 | #include "i18n.hh" | 26 | #include "I18n.hh" |
27 | #include "Screen.hh" | 27 | #include "Screen.hh" |
28 | #include "Window.hh" | 28 | #include "Window.hh" |
29 | #include "ImageControl.hh" | 29 | #include "ImageControl.hh" |
diff --git a/src/Makefile.am b/src/Makefile.am index d9288f7..21221d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -61,7 +61,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
61 | FbWinFrameTheme.hh FbWinFrameTheme.cc \ | 61 | FbWinFrameTheme.hh FbWinFrameTheme.cc \ |
62 | fluxbox.cc fluxbox.hh ${gnome_SOURCE} \ | 62 | fluxbox.cc fluxbox.hh ${gnome_SOURCE} \ |
63 | IconBar.cc IconBar.hh \ | 63 | IconBar.cc IconBar.hh \ |
64 | i18n.cc i18n.hh \ | 64 | I18n.cc I18n.hh \ |
65 | Keys.cc Keys.hh main.cc \ | 65 | Keys.cc Keys.hh main.cc \ |
66 | Netizen.cc Netizen.hh \ | 66 | Netizen.cc Netizen.hh \ |
67 | RootTheme.hh RootTheme.cc \ | 67 | RootTheme.hh RootTheme.cc \ |
diff --git a/src/Slit.cc b/src/Slit.cc index d4a6837..83d2928 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Slit.cc,v 1.59 2003/06/05 11:30:06 fluxgen Exp $ | 25 | // $Id: Slit.cc,v 1.60 2003/06/13 05:03:43 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -35,7 +35,7 @@ | |||
35 | #include "config.h" | 35 | #include "config.h" |
36 | #endif // HAVE_CONFIG_H | 36 | #endif // HAVE_CONFIG_H |
37 | 37 | ||
38 | #include "i18n.hh" | 38 | #include "I18n.hh" |
39 | #include "Screen.hh" | 39 | #include "Screen.hh" |
40 | #include "ImageControl.hh" | 40 | #include "ImageControl.hh" |
41 | #include "RefCount.hh" | 41 | #include "RefCount.hh" |
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 038532b..544a1e3 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -22,11 +22,11 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Toolbar.cc,v 1.89 2003/06/11 14:51:22 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.90 2003/06/13 05:04:14 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
29 | #include "i18n.hh" | 29 | #include "I18n.hh" |
30 | #include "fluxbox.hh" | 30 | #include "fluxbox.hh" |
31 | #include "Screen.hh" | 31 | #include "Screen.hh" |
32 | #include "Window.hh" | 32 | #include "Window.hh" |
@@ -389,7 +389,9 @@ void Toolbar::enableIconBar() { | |||
389 | if (m_iconbar.get() != 0) | 389 | if (m_iconbar.get() != 0) |
390 | return; // already on | 390 | return; // already on |
391 | 391 | ||
392 | m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); | 392 | m_iconbar.reset(new IconBar(screen(), |
393 | frame.window_label.window(), | ||
394 | m_theme.font())); | ||
393 | } | 395 | } |
394 | 396 | ||
395 | void Toolbar::disableIconBar() { | 397 | void Toolbar::disableIconBar() { |