aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc2
-rw-r--r--src/fluxbox.cc4
-rw-r--r--src/main.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 63143ec..1e3d1c4 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -252,7 +252,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm,
252 click_raises(rm, true, scrname+".clickRaises"), 252 click_raises(rm, true, scrname+".clickRaises"),
253 default_deco(rm, "NORMAL", scrname+".defaultDeco"), 253 default_deco(rm, "NORMAL", scrname+".defaultDeco"),
254 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"), 254 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"),
255 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu2"), scrname+".windowMenu"), 255 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu.lua"), scrname+".windowMenu"),
256 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"), 256 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"),
257 workspaces(rm, 4, scrname+".workspaces"), 257 workspaces(rm, 4, scrname+".workspaces"),
258 edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"), 258 edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"),
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 410bb45..b49e61f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -246,8 +246,8 @@ Fluxbox::Fluxbox(int argc, char **argv,
246 m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"), 246 m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"),
247 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"), 247 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"),
248 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"), 248 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"),
249 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"), 249 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu.lua", "menuFile"),
250 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"), 250 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys.lua", "keyFile"),
251 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"), 251 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"),
252 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"), 252 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"),
253 m_rc_cache_life(m_resourcemanager, 5, "cacheLife"), 253 m_rc_cache_life(m_resourcemanager, 5, "cacheLife"),
diff --git a/src/main.cc b/src/main.cc
index 6fabf6a..e9355f9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -230,7 +230,7 @@ struct Options {
230 env = getenv("HOME"); 230 env = getenv("HOME");
231 if (env) { 231 if (env) {
232 rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); 232 rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
233 rc_file = rc_path + "/init2"; 233 rc_file = rc_path + "/init.lua";
234 } 234 }
235 } 235 }
236 236