aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 5131c5d..0f00bc7 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -243,7 +243,6 @@ Fluxbox::Fluxbox(int argc, char **argv,
243 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), 243 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"),
244 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"), 244 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"),
245 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), 245 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"),
246 m_rc_slitlistfile(m_resourcemanager, m_RC_PATH + "/slitlist", "slitlistFile", "SlitlistFile"),
247 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), 246 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"),
248 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), 247 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"),
249 m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), 248 m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"),
@@ -1174,13 +1173,6 @@ void Fluxbox::load_rc() {
1174 1173
1175 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); 1174 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
1176 1175
1177 if (!m_rc_slitlistfile->empty()) {
1178 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);
1179 } else {
1180 string filename = getDefaultDataFilename("slitlist");
1181 m_rc_slitlistfile.setFromString(filename.c_str());
1182 }
1183
1184 *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6); 1176 *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6);
1185 1177
1186 if (m_rc_stylefile->empty()) 1178 if (m_rc_stylefile->empty())