1.1 --- a/desktop/__init__.py Thu Sep 06 00:10:34 2012 +0200
1.2 +++ b/desktop/__init__.py Thu Sep 06 00:13:31 2012 +0200
1.3 @@ -5,7 +5,8 @@
1.4 detection and resource opening support for a selection of common and
1.5 standardised desktop environments.
1.6
1.7 -Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012 Paul Boddie <paul@boddie.org.uk>
1.9 +Copyright (C) 2012 Jérôme Laheurte <fraca7@free.fr>
1.10
1.11 This program is free software; you can redistribute it and/or modify it under
1.12 the terms of the GNU Lesser General Public License as published by the Free
1.13 @@ -156,8 +157,11 @@
1.14
1.15 if os.environ.has_key("KDE_FULL_SESSION") or \
1.16 os.environ.has_key("KDE_MULTIHEAD"):
1.17 - if int(os.environ.get("KDE_SESSION_VERSION", "3")) >= 4:
1.18 - return "KDE4"
1.19 + try:
1.20 + if int(os.environ.get("KDE_SESSION_VERSION", "3")) >= 4:
1.21 + return "KDE4"
1.22 + except ValueError:
1.23 + pass
1.24 return "KDE"
1.25 elif os.environ.has_key("GNOME_DESKTOP_SESSION_ID") or \
1.26 os.environ.has_key("GNOME_KEYRING_SOCKET"):
2.1 --- a/docs/COPYING.txt Thu Sep 06 00:10:34 2012 +0200
2.2 +++ b/docs/COPYING.txt Thu Sep 06 00:13:31 2012 +0200
2.3 @@ -1,7 +1,8 @@
2.4 Licence Agreement for desktop
2.5 -----------------------------
2.6
2.7 -Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
2.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012 Paul Boddie <paul@boddie.org.uk>
2.9 +Copyright (C) 2012 Jérôme Laheurte <fraca7@free.fr>
2.10
2.11 This program is free software; you can redistribute it and/or modify it under
2.12 the terms of the GNU Lesser General Public License as published by the Free