/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: Elliot Murphy
  • Date: 2008-06-04 20:36:54 UTC
  • mto: This revision was merged to the branch mainline in revision 501.
  • Revision ID: elliot@elliotmurphy.com-20080604203654-21e327jxe5cs7zgx
Trying to fix bug 107169 so that visualize can be used even if there are DBus problems which prevent seahorse from being loaded

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
31
31
try:
32
32
    bus = dbus.SessionBus()
33
33
except dbus.exceptions.DBusException, e:
34
 
    get_name = getattr(e, 'get_dbus_name', None)
35
 
    if get_name is not None:
36
 
        name = get_name()
37
 
    else:
38
 
        name = getattr(e, '_dbus_error_name', None)
39
 
    # DBus sometimes fails like this, just treat it as if seahorse is not
40
 
    # available rather than crashing.
41
 
    if name == "org.freedesktop.DBus.Error.Spawn.ExecFailed":
 
34
    raise ImportError
 
35
 
 
36
try: 
 
37
    crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
 
38
                            CRYPTO_INTERFACE)
 
39
    openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
 
40
                             OPENPGP_INTERFACE)
 
41
except dbus.exceptions.DBusException, e:
 
42
    if e.get_dbus_name() == 'org.freedesktop.DBus.Error.ServiceUnknown':
42
43
        raise ImportError
43
 
    else:
44
 
        raise
45
 
 
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)
 
44
    raise
59
45
 
60
46
FLAG_VALID = 0x0001
61
47
FLAG_CAN_ENCRYPT = 0x0002
85
71
        if key not in keyset:
86
72
            keyset[key] = Key(key)
87
73
 
88
 
        return (cleartext, keyset[key])
89
 
 
90
 
    return (cleartext, None)
91
 
 
 
74
        return keyset[key]
92
75
 
93
76
class Key:
94
77