diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 20:40:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 20:40:17 +0000 |
| commit | 11991c3c0937980ac8934a97e7dfb39a68c9fdfe (patch) | |
| tree | 5329a5fc4dfa5f8049670dbf82146a3a3fd3baf1 /base/linux_util.cc | |
| parent | 6278e373813049242dcd5da1c9cf7dd7477d4dff (diff) | |
| download | chromium_src-11991c3c0937980ac8934a97e7dfb39a68c9fdfe.zip chromium_src-11991c3c0937980ac8934a97e7dfb39a68c9fdfe.tar.gz chromium_src-11991c3c0937980ac8934a97e7dfb39a68c9fdfe.tar.bz2 | |
GTK: Improve xfce detection.
On Hardy, the DESKTOP_SESSION environment variable is "xfce4" but on Karmic,
it is "xfce"
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1572042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/linux_util.cc')
| -rw-r--r-- | base/linux_util.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/linux_util.cc b/base/linux_util.cc index b552b93..6197bc3 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -229,18 +229,18 @@ FilePath GetXDGUserDirectory(EnvVarGetter* env, const char* dir_name, DesktopEnvironment GetDesktopEnvironment(EnvVarGetter* env) { std::string desktop_session; if (env->GetEnv("DESKTOP_SESSION", &desktop_session)) { - if (desktop_session == "gnome") + if (desktop_session == "gnome") { return DESKTOP_ENVIRONMENT_GNOME; - else if (desktop_session == "kde4") + } else if (desktop_session == "kde4") { return DESKTOP_ENVIRONMENT_KDE4; - else if (desktop_session == "kde") { + } else if (desktop_session == "kde") { // This may mean KDE4 on newer systems, so we have to check. if (env->HasEnv("KDE_SESSION_VERSION")) return DESKTOP_ENVIRONMENT_KDE4; return DESKTOP_ENVIRONMENT_KDE3; - } - else if (desktop_session == "xfce4") + } else if (desktop_session.find("xfce") != std::string::npos) { return DESKTOP_ENVIRONMENT_XFCE; + } } // Fall back on some older environment variables. |