# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1346883211 -7200
# Node ID 6e8484fcb1aba411bdb2522536bf0b4e8aa7ca17
# Parent  fe0b32f2c4af8aa45ca6bb538f400c01a9d400ce
Added exception handling.
Updated the copyright information.

diff -r fe0b32f2c4af -r 6e8484fcb1ab desktop/__init__.py
--- a/desktop/__init__.py	Thu Sep 06 00:10:34 2012 +0200
+++ b/desktop/__init__.py	Thu Sep 06 00:13:31 2012 +0200
@@ -5,7 +5,8 @@
 detection and resource opening support for a selection of common and
 standardised desktop environments.
 
-Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2012 Jérôme Laheurte <fraca7@free.fr>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the Free
@@ -156,8 +157,11 @@
 
     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"
+        try:
+            if int(os.environ.get("KDE_SESSION_VERSION", "3")) >= 4:
+                return "KDE4"
+        except ValueError:
+            pass
         return "KDE"
     elif os.environ.has_key("GNOME_DESKTOP_SESSION_ID") or \
         os.environ.has_key("GNOME_KEYRING_SOCKET"):
diff -r fe0b32f2c4af -r 6e8484fcb1ab docs/COPYING.txt
--- a/docs/COPYING.txt	Thu Sep 06 00:10:34 2012 +0200
+++ b/docs/COPYING.txt	Thu Sep 06 00:13:31 2012 +0200
@@ -1,7 +1,8 @@
 Licence Agreement for desktop
 -----------------------------
 
-Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2012 Jérôme Laheurte <fraca7@free.fr>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the Free