This patch makes us use seahorse when it's available, not just when it's already been started.
Cheers, Jelmer --
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: 28bf0327d8e9a5b7bbe5bcf7d4d19808a32e3fc9
# timestamp: 2008-07-23 02:08:45 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'seahorse.py'
--- seahorse.py 2008-06-29 19:07:23 +0000
+++ seahorse.py 2008-07-23 00:07:09 +0000
@@ -30,6 +30,10 @@
try:
bus = dbus.SessionBus()
+ crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH),
+ CRYPTO_INTERFACE)
+ openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
+ OPENPGP_INTERFACE)
except dbus.exceptions.DBusException, e:
get_name = getattr(e, 'get_dbus_name', None)
if get_name is not None:
@@ -38,25 +42,12 @@
name = getattr(e, '_dbus_error_name', None)
# DBus sometimes fails like this, just treat it as if seahorse is not
# available rather than crashing.
- if name == "org.freedesktop.DBus.Error.Spawn.ExecFailed":
+ if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed",
+ "org.freedesktop.DBus.Error.ServiceUnknown"):
raise ImportError
else:
raise
-if hasattr(bus, 'list_activatable_names'):
- bus_names = bus.list_activatable_names()
-else:
- bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
- bus_names = bus_object.ListNames(dbus_interface='org.freedesktop.DBus')
-
-if BUS_NAME not in bus_names:
- raise ImportError
-
-crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH),
- CRYPTO_INTERFACE)
-openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
- OPENPGP_INTERFACE)
-
FLAG_VALID = 0x0001
FLAG_CAN_ENCRYPT = 0x0002
FLAG_CAN_SIGN = 0x0004
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaIqF8sAAZL/gEAUAGBRZ///
f/PfIL////BQA/jwHQ6aGjpDKo9T1NBoyepoeoAAaAANAAAANKIPU9NHqaTQAAAAAAAAADQmpkaG
ijbUnqaMQAPUAAANNMg0HGTJpphMjIGBGJowRhBo0wACCSRBqZqaYmgJjUBo0Jgp6nqbTU9NI0/S
npMlZNK/ZrinVyRyi0Pa8XovKUGUDodgYpB5gYNZK6ZpJKSKkeCERSgvX4qtHjiMGZL7DOrQZhiC
pIMWCBmp81jNn0ZIcIjmvN01crlytWedFMSuQNMHPTNbouSx1zNqg2UV2ikyY3gc252+8sIjv2OL
yM21mkJtBsFkKRFy9+da7p7zYaGJTAON6RhuLjRDFL3olA1VO5dhjFIA8F0I03MpDjTnCZZGE4FI
KUgpz3NvP+l4VImIPoOZ5KuGyzGOPInNBDptw0xXZsuyuoJzEWC1CeqJCmUExgWAmE8RlM6txE4Y
idwwnTFJbGYfdcPMJQMUE85QdynHxKXfCwFJjFMdcLKnYijvqMOogcBNasZOsZoYi+cofpRSODTM
KNTDhGHSVwGMChj2FoUsNAEYD4daeJBiSy6hIJuCwgLffBgwyKtpNBG5kxcnxMIS6zvXYwvBjMdG
uYbDrZ2g2sOzeRz7nyOJmc+CR6H2P7K5q2THgd3qfyeeToPU/owRN5Kv8OaQkPwSl0R5Ufc+1UCU
3mQ/BvMBafBUTGExHgZ6sZJh+BzpdiYOQdf9X8TdyQ8GOU9PY6KDsPkKk6AkHd7iSQ2WmHopCG9R
R+XZeyCQJYUHREJEwIGYcgkOcCM53H0UvYKiJ6mspHEnoQHGc1eR+fobJJWq+dvtQizKGBOTQCJY
UFMC01kosRlm2fXTx4M44kf7Zx7ttsBxC3RWbTCAcrmHBECzSPIUypsSlB5hofEkQNEf8SCLbOPJ
XIkMSfqAduogTrMUAYE+WNRKaDIMK0zlJA37Nepl4nTFCyxFIXYhflwqzMFF1Py51SX1hNi4Gs9A
kObKcmhUymI+4R6tDpMYGIB2t9nByH/ZtzHSOTcRcKngM+cG8CpH+1DmN2fqiCdxY+0+dBwqYSlA
qnMhdO8WFjLBCWhYD8lZYSAh9HVscNoqh1mWzjB5hCiyGW3aaxbCnxt4YAdc80Dc4Tg60jmIrUXS
qEW7HGPJffeu2UmRCgTJmFqhAb+FWoi6jcaeJojGsTAnB1c2U2Toq68tbJ9BQhNO5OzPuDSepMUz
jjDjRDGMljfBNaDO4fxEFeIYmYSqGyADeHljQNOE4co1WCuqstOAWrRAifuQGx2XlZBsMo4i1ZgC
cPeRxMyrcXzGt7vMvCF/jQp7QKy4TT2XUebF8FW+MiRI2GBLxkdg3Zv8XckU4UJCiKhfLA==
signature.asc
Description: Digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
