Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: extract GetXDGConfigHome() into a separate function

Browse Source 
No real changes, just avoid doing the same thing in 2 different places and do
it in a single helper function instead.
This commit is contained in:
Vadim Zeitlin
2017-03-09 18:00:29 +01:00
parent a44b61e976
commit 41fe019f3b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unix/stdpaths.cpp
View File

@@ -50,6 +50,16 @@ void wxStandardPaths::SetInstallPrefix(const wxString& prefix)
m_prefix = prefix;
}
// Helper function returning the value of XDG_CONFIG_HOME environment variable
// or its default value if it is not defined.
static wxString GetXDGConfigHome()
{
wxString dir;
if ( !wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
dir = wxFileName::GetHomeDir() + wxS("/.config");
return dir;
}
wxString wxStandardPaths::GetUserConfigDir() const
{
wxString dir;
@@ -61,8 +71,7 @@ wxString wxStandardPaths::GetUserConfigDir() const
break;
case FileLayout_XDG:
if ( !wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
dir = wxFileName::GetHomeDir() + wxS("/.config");
dir = GetXDGConfigHome();
break;
}
@@ -268,12 +277,7 @@ wxString wxStandardPaths::GetUserDir(Dir userDir) const
return homeDir + wxT("/.cache");
}
wxString configPath;
if (wxGetenv(wxT("XDG_CONFIG_HOME")))
configPath = wxGetenv(wxT("XDG_CONFIG_HOME"));
else
configPath = homeDir + wxT("/.config");
wxString dirsFile = configPath + wxT("/user-dirs.dirs");
wxString dirsFile = GetXDGConfigHome() + wxT("/user-dirs.dirs");
if (wxFileExists(dirsFile))
{
wxString userDirId;