diff options
Diffstat (limited to 'base/nix/xdg_util.cc')
-rw-r--r-- | base/nix/xdg_util.cc | 14 |
1 files changed, 12 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; } |