Properly detect KDE4 on newer systems (e.g. [K]Ubuntu 9.04).

base/linux_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/linux_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 209 matching lines @@
   return new EnvironmentVariableGetterImpl();
 }
 
 DesktopEnvironment GetDesktopEnvironment(EnvironmentVariableGetter* env) {
   std::string desktop_session;
   if (env->Getenv("DESKTOP_SESSION", &desktop_session)) {
     if (desktop_session == "gnome")
       return DESKTOP_ENVIRONMENT_GNOME;
     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.
+      std::string dummy;
+      if (env->Getenv("KDE_SESSION_VERSION", &dummy))

[Evan Martin, 2009/11/21 18:31:58]

We should really fix Getenv to accept a NULL argument so we don't need all of
these "dummy" variables.  :)

[Lei Zhang, 2009/11/25 03:07:52]

On my Kubuntu 9.04 box, KDE_SESSION_VERSION=4. Shouldn't we check that? Same
below on line 245. I realize that variable doesn't exist on KDE 3.

[Mike Mammarella, 2009/11/25 09:35:53]

My reasoning was that if we check for its value, then we'll start detecting KDE3
again if they change that value (e.g. to 4.4, 5, 4-dfsg1-10ubuntu8, etc.) rather
than KDE4. The presence of the variable indicates KDE >= 4 which is all we care
about currently.

+        return DESKTOP_ENVIRONMENT_KDE4;
       return DESKTOP_ENVIRONMENT_KDE3;
+    }
   }
 
   // Fall back on some older environment variables.
   // Useful particularly in the DESKTOP_SESSION=default case.
   std::string dummy;
   if (env->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy)) {
     return DESKTOP_ENVIRONMENT_GNOME;
   } else if (env->Getenv("KDE_FULL_SESSION", &dummy)) {
     if (env->Getenv("KDE_SESSION_VERSION", &dummy))
       return DESKTOP_ENVIRONMENT_KDE4;
@@ skipping 87 matching lines @@
       }
     }
 
     closedir(fd);
   }
 
   return already_found;
 }
 
 }  // namespace base