/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to seahorse.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
30
30
 
31
31
try:
32
32
    bus = dbus.SessionBus()
 
33
    crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
 
34
                            CRYPTO_INTERFACE)
 
35
    openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
 
36
                             OPENPGP_INTERFACE)
33
37
except dbus.exceptions.DBusException, e:
34
38
    get_name = getattr(e, 'get_dbus_name', None)
35
39
    if get_name is not None:
36
40
        name = get_name()
37
41
    else:
38
42
        name = getattr(e, '_dbus_error_name', None)
 
43
 
 
44
    if name is None:
 
45
        args = getattr(e, 'args', None) # This is case for old python-dbus-0.62
 
46
        if args == ("Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)",):
 
47
            raise ImportError
 
48
 
39
49
    # DBus sometimes fails like this, just treat it as if seahorse is not
40
50
    # available rather than crashing.
41
 
    if name == "org.freedesktop.DBus.Error.Spawn.ExecFailed":
 
51
    if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed", 
 
52
                "org.freedesktop.DBus.Error.ServiceUnknown",
 
53
                "org.freedesktop.DBus.Error.NotSupported"):
42
54
        raise ImportError
43
55
    else:
44
56
        raise
45
57
 
46
 
if hasattr(bus, 'list_activatable_names'):
47
 
    bus_names = bus.list_activatable_names()
48
 
else:
49
 
    bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
50
 
    bus_names = bus_object.ListNames(dbus_interface='org.freedesktop.DBus')
51
 
 
52
 
if BUS_NAME not in bus_names:
53
 
    raise ImportError
54
 
 
55
 
crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
56
 
                        CRYPTO_INTERFACE)
57
 
openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
58
 
                         OPENPGP_INTERFACE)
59
 
 
60
58
FLAG_VALID = 0x0001
61
59
FLAG_CAN_ENCRYPT = 0x0002
62
60
FLAG_CAN_SIGN = 0x0004
85
83
        if key not in keyset:
86
84
            keyset[key] = Key(key)
87
85
 
88
 
        return keyset[key]
 
86
        return (cleartext, keyset[key])
 
87
 
 
88
    return (cleartext, None)
 
89
 
89
90
 
90
91
class Key:
91
92