From 9b9f34d9464ce780c7d8e9b96523f7349c898afb Mon Sep 17 00:00:00 2001
From: simonb <simonb>
Date: Tue, 14 Feb 2006 12:46:29 +0000
Subject: fix nls compilation (committed on akira's behalf)

---
 ChangeLog          | 3 +++
 nls/fluxbox-nls.hh | 1 +
 src/RootTheme.cc   | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ec60e8..f9a2a01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.15:
+*06/02/14:
+   * Fix nls compilation (Mathias)
+     RootTheme.cc fbsetbg
 *06/02/12:
    * Fixed #bug #1417688, remember apps keeps incrementing vertical dimension  (Henrik)
      Remember.cc
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index 2d2c2c2..89dffd8 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -49,6 +49,7 @@ enum {
 	CommonMaximizeOver = 16,
 	CommonSvnRevision = 17,
 	CommonVisible = 18,
+    CommonBackgroundWarning = 19,
 
 	ConfigmenuSet = 4,
 	ConfigmenuAntiAlias = 1,
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index f200918..3802874 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -136,6 +136,8 @@ bool RootTheme::fallback(FbTk::ThemeItem_base &item) {
 }
 
 void RootTheme::reconfigTheme() {
+    _FB_USES_NLS;
+
     if (m_lock)
         return;
 
@@ -164,7 +166,7 @@ void RootTheme::reconfigTheme() {
         FbTk::FbPixmap root(FbTk::FbPixmap::getRootPixmap(screenNum(), true));
 
         // render text
-        static const char warning_msg[] = 
+        static const char *warning_msg = 
             _FBTEXT(Common, BackgroundWarning,
                     "There is no background option specified in this style."
                     " Please consult the manual or read the FAQ.",
@@ -188,8 +190,6 @@ void RootTheme::reconfigTheme() {
         }
 
         
-        _FB_USES_NLS;
-
         FbTk::GContext gc(root);        
         // fill rectangle
         gc.setForeground(FbTk::Color("black", screenNum()));
-- 
cgit v0.11.2