aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-20 20:16:30 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-17 00:09:34 (GMT)
commitcb42b13e5dfcbebad6ac6d6cf757870b7b8a65ae (patch)
treeb860751172054b5342a9674c9dc44c132831b435 /src/fluxbox.cc
parentd57c93b1576879ba29ef172b58a0ef2e04403b1b (diff)
downloadfluxbox_pavel-cb42b13e5dfcbebad6ac6d6cf757870b7b8a65ae.zip
fluxbox_pavel-cb42b13e5dfcbebad6ac6d6cf757870b7b8a65ae.tar.bz2
Convert slitlist from a separate file to a regular lua resource
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 8e9c543..177e985 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -251,7 +251,6 @@ Fluxbox::Fluxbox(int argc, char **argv,
251 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), 251 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"),
252 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"), 252 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"),
253 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), 253 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"),
254 m_rc_slitlistfile(m_resourcemanager, m_RC_PATH + "/slitlist", "slitlistFile", "SlitlistFile"),
255 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), 254 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"),
256 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), 255 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"),
257 m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), 256 m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"),
@@ -1183,13 +1182,6 @@ void Fluxbox::load_rc() {
1183 1182
1184 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); 1183 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
1185 1184
1186 if (!m_rc_slitlistfile->empty()) {
1187 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);
1188 } else {
1189 string filename = getDefaultDataFilename("slitlist");
1190 m_rc_slitlistfile.setFromString(filename.c_str());
1191 }
1192
1193 *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6); 1185 *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6);
1194 1186
1195 if (m_rc_stylefile->empty()) 1187 if (m_rc_stylefile->empty())