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

base/linux_util.cc

Index: base/linux_util.cc
===================================================================
--- base/linux_util.cc	(revision 32744)
+++ base/linux_util.cc	(working copy)
@@ -227,8 +227,13 @@
       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.