/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: Russ Brown
  • Date: 2008-06-06 18:04:45 UTC
  • mto: This revision was merged to the branch mainline in revision 509.
  • Revision ID: pickscrape@gmail.com-20080606180445-5j2errz6vel1gaek
Added NEWS item for Refresh menu option and shortcut.

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
28
28
KEY_TYPE_OPENPGP = 'openpgp'
29
29
KEY_TYPE_SSH = 'ssh'
30
30
 
31
 
try:
32
 
    dbus.validate_bus_name(BUS_NAME)
33
 
except ValueError:
 
31
bus = dbus.SessionBus()
 
32
 
 
33
if hasattr(bus, 'list_activatable_names'):
 
34
    bus_names = bus.list_activatable_names()
 
35
else:
 
36
    bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
 
37
    bus_names = bus_object.ListNames(dbus_interface='org.freedesktop.DBus')
 
38
 
 
39
if BUS_NAME not in bus_names:
34
40
    raise ImportError
35
41
 
36
 
bus = dbus.SessionBus()
37
 
 
38
42
crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
39
43
                        CRYPTO_INTERFACE)
40
44
openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),