From 48ca337c6eb1dfc41c4fbd01abeb1e5ce3132ab6 Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Fri, 23 Jan 2015 10:28:16 +0100 Subject: Also read /etc/luminaDesktop.conf. On (at least) OpenBSD, external packages are installed under /usr/local but SYSCONFDIR is always /etc. That is external applications will install their configuration file under /etc even if the binaries are under /usr/local. --- libLumina/LuminaUtils.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libLumina/LuminaUtils.cpp') diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp index b82ee599..fb2e31bd 100644 --- a/libLumina/LuminaUtils.cpp +++ b/libLumina/LuminaUtils.cpp @@ -151,6 +151,8 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::AppPrefix()+"etc/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf"); } if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile(LOS::SysPrefix()+"etc/luminaDesktop.conf.dist"); } + if(sysDefaults.isEmpty() && !skipOS) { sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf"); } + if(sysDefaults.isEmpty() && !skipOS){ sysDefaults = LUtils::readFile("/etc/luminaDesktop.conf.dist"); } if(sysDefaults.isEmpty()){ sysDefaults = LUtils::readFile(LOS::LuminaShare()+"luminaDesktop.conf"); } //Find the number of the left-most desktop screen QString screen = "0"; -- cgit