M ChangeLog → 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

M nls/fluxbox-nls.hh → nls/fluxbox-nls.hh

@@ -49,6 +49,7 @@ CommonFluxboxVersion = 15,
 	CommonMaximizeOver = 16,
 	CommonSvnRevision = 17,
 	CommonVisible = 18,
+    CommonBackgroundWarning = 19,
 
 	ConfigmenuSet = 4,
 	ConfigmenuAntiAlias = 1,

M src/RootTheme.cc → src/RootTheme.cc

@@ -136,6 +136,8 @@ return false;
 }
 
 void RootTheme::reconfigTheme() {
+    _FB_USES_NLS;
+
     if (m_lock)
         return;
 
@@ -164,7 +166,7 @@ // get the pixmap, force update of pixmap (needed if this is the first time)
         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 @@ }
         }
 
         
-        _FB_USES_NLS;
-
         FbTk::GContext gc(root);        
         // fill rectangle
         gc.setForeground(FbTk::Color("black", screenNum()));