Rev 480: Merge DBus fix from Daniel, fix comment. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 480
revision-id: jelmer at samba.org-20080501214950-zjs5qxi898ol12eb
parent: jelmer at samba.org-20080501212233-ekkpkb7poy5j4xt8
parent: daniel.schierbeck at gmail.com-20080430112601-yul8svagkmpeqxwo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 23:49:50 +0200
message:
  Merge DBus fix from Daniel, fix comment.
modified:
  seahorse.py                    crypt.py-20080401000513-m7ksudqlvqbdfejf-1
    ------------------------------------------------------------
    revno: 473.2.1
    revision-id: daniel.schierbeck at gmail.com-20080430112601-yul8svagkmpeqxwo
    parent: aaron at aaronbentley.com-20080428222406-sd3i9mjfwjzap5gr
    committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
    branch nick: fix-missing-dbus
    timestamp: Wed 2008-04-30 13:26:01 +0200
    message:
      Made the seahorse module fail correctly when a proper version of DBus isn't found.
    modified:
      seahorse.py                    crypt.py-20080401000513-m7ksudqlvqbdfejf-1
=== modified file 'seahorse.py'
--- a/seahorse.py	2008-04-03 20:30:15 +0000
+++ b/seahorse.py	2008-05-01 21:49:50 +0000
@@ -31,6 +31,10 @@
 try:
     dbus.validate_bus_name(BUS_NAME)
 except ValueError:
+    # Seahorse isn't installed
+    raise ImportError
+except AttributeError:
+    # Outdated version of DBus that doesn't have validate_bus_name
     raise ImportError
 
 bus = dbus.SessionBus()