# HG changeset patch # User Paul Boddie # Date 1346883034 -7200 # Node ID fe0b32f2c4af8aa45ca6bb538f400c01a9d400ce # Parent 1bd81cc4989ef5cc08ac69b0593a19c4b11b7238 KDE 4 support contributed by J?r?me Laheurte. diff -r 1bd81cc4989e -r fe0b32f2c4af desktop/__init__.py --- a/desktop/__init__.py Sun Jun 21 22:47:20 2009 +0200 +++ b/desktop/__init__.py Thu Sep 06 00:10:34 2012 +0200 @@ -156,6 +156,8 @@ if os.environ.has_key("KDE_FULL_SESSION") or \ os.environ.has_key("KDE_MULTIHEAD"): + if int(os.environ.get("KDE_SESSION_VERSION", "3")) >= 4: + return "KDE4" return "KDE" elif os.environ.has_key("GNOME_DESKTOP_SESSION_ID") or \ os.environ.has_key("GNOME_KEYRING_SOCKET"): @@ -196,6 +198,8 @@ # Test for desktops where the overriding is not verified. + elif (desktop or detected) == "KDE4": + return "KDE4" elif (desktop or detected) == "KDE": return "KDE" elif (desktop or detected) == "GNOME": @@ -256,6 +260,9 @@ # NOTE: This returns None in current implementations. return os.startfile(url) + elif desktop_in_use == "KDE4": + cmd = ["kioclient", "exec", url] + elif desktop_in_use == "KDE": cmd = ["kfmclient", "exec", url]