aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--nls/fluxbox-nls.hh1
-rw-r--r--src/RootTheme.cc6
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*06/02/14:
4 * Fix nls compilation (Mathias)
5 RootTheme.cc fbsetbg
3*06/02/12: 6*06/02/12:
4 * Fixed #bug #1417688, remember apps keeps incrementing vertical dimension (Henrik) 7 * Fixed #bug #1417688, remember apps keeps incrementing vertical dimension (Henrik)
5 Remember.cc 8 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 {
49 CommonMaximizeOver = 16, 49 CommonMaximizeOver = 16,
50 CommonSvnRevision = 17, 50 CommonSvnRevision = 17,
51 CommonVisible = 18, 51 CommonVisible = 18,
52 CommonBackgroundWarning = 19,
52 53
53 ConfigmenuSet = 4, 54 ConfigmenuSet = 4,
54 ConfigmenuAntiAlias = 1, 55 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) {
136} 136}
137 137
138void RootTheme::reconfigTheme() { 138void RootTheme::reconfigTheme() {
139 _FB_USES_NLS;
140
139 if (m_lock) 141 if (m_lock)
140 return; 142 return;
141 143
@@ -164,7 +166,7 @@ void RootTheme::reconfigTheme() {
164 FbTk::FbPixmap root(FbTk::FbPixmap::getRootPixmap(screenNum(), true)); 166 FbTk::FbPixmap root(FbTk::FbPixmap::getRootPixmap(screenNum(), true));
165 167
166 // render text 168 // render text
167 static const char warning_msg[] = 169 static const char *warning_msg =
168 _FBTEXT(Common, BackgroundWarning, 170 _FBTEXT(Common, BackgroundWarning,
169 "There is no background option specified in this style." 171 "There is no background option specified in this style."
170 " Please consult the manual or read the FAQ.", 172 " Please consult the manual or read the FAQ.",
@@ -188,8 +190,6 @@ void RootTheme::reconfigTheme() {
188 } 190 }
189 191
190 192
191 _FB_USES_NLS;
192
193 FbTk::GContext gc(root); 193 FbTk::GContext gc(root);
194 // fill rectangle 194 // fill rectangle
195 gc.setForeground(FbTk::Color("black", screenNum())); 195 gc.setForeground(FbTk::Color("black", screenNum()));