summaryrefslogtreecommitdiffstats
path: root/base/nix
diff options
context:
space:
mode:
Diffstat (limited to 'base/nix')
-rw-r--r--base/nix/xdg_util.cc14
-rw-r--r--base/nix/xdg_util.h6
2 files changed, 18 insertions, 2 deletions
diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
index 7d26344..08d4eee 100644
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -11,9 +11,19 @@
#include "base/file_util.h"
#include "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.h"
+namespace {
+
+// The KDE session version environment variable used in KDE 4.
+const char kKDE4SessionEnvVar[] = "KDE_SESSION_VERSION";
+
+} // namespace
+
namespace base {
namespace nix {
+const char kDotConfigDir[] = ".config";
+const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
+
FilePath GetXDGDirectory(Environment* env, const char* env_name,
const char* fallback_dir) {
FilePath path;
@@ -46,7 +56,7 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) {
return DESKTOP_ENVIRONMENT_KDE4;
} else if (desktop_session == "kde") {
// This may mean KDE4 on newer systems, so we have to check.
- if (env->HasVar("KDE_SESSION_VERSION"))
+ if (env->HasVar(kKDE4SessionEnvVar))
return DESKTOP_ENVIRONMENT_KDE4;
return DESKTOP_ENVIRONMENT_KDE3;
} else if (desktop_session.find("xfce") != std::string::npos ||
@@ -60,7 +70,7 @@ DesktopEnvironment GetDesktopEnvironment(Environment* env) {
if (env->HasVar("GNOME_DESKTOP_SESSION_ID")) {
return DESKTOP_ENVIRONMENT_GNOME;
} else if (env->HasVar("KDE_FULL_SESSION")) {
- if (env->HasVar("KDE_SESSION_VERSION"))
+ if (env->HasVar(kKDE4SessionEnvVar))
return DESKTOP_ENVIRONMENT_KDE4;
return DESKTOP_ENVIRONMENT_KDE3;
}
diff --git a/base/nix/xdg_util.h b/base/nix/xdg_util.h
index cb8072ce..1e0c5f3 100644
--- a/base/nix/xdg_util.h
+++ b/base/nix/xdg_util.h
@@ -27,6 +27,12 @@ class Environment;
namespace nix {
+// The default XDG config directory name.
+BASE_EXPORT extern const char kDotConfigDir[];
+
+// The XDG config directory environment variable.
+BASE_EXPORT extern const char kXdgConfigHomeEnvVar[];
+
// Utility function for getting XDG directories.
// |env_name| is the name of an environment variable that we want to use to get
// a directory path. |fallback_dir| is the directory relative to $HOME that we