This fixes an error where the signature tab wasn't shown, because the
Seahorse daemon hadn't been started.


Cheers,
Daniel
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
#   hnsoywvk9on3h9g5
# target_branch: file:///home/daniel/Projects/bzr-gtk/trunk/
# testament_sha1: 7932c6d4f17d36e7d4d99db8e48b49028b66269f
# timestamp: 2008-04-03 13:29:47 +0200
# base_revision_id: [EMAIL PROTECTED]
#   eik8uerq3mkla3f7
# 
# Begin patch
=== modified file 'seahorse.py'
--- seahorse.py	2008-04-02 23:39:44 +0000
+++ seahorse.py	2008-04-03 11:29:04 +0000
@@ -28,11 +28,13 @@
 KEY_TYPE_OPENPGP = 'openpgp'
 KEY_TYPE_SSH = 'ssh'
 
+try:
+    dbus.validate_bus_name(BUS_NAME)
+except ValueError:
+    raise ImportError
+
 bus = dbus.SessionBus()
 
-if not bus.name_has_owner(BUS_NAME):
-    raise ImportError
-
 crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
                         CRYPTO_INTERFACE)
 openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSJx4qIAAdnfgGAQUWv//3//
f3C////wUARe5FFMVdsHo8g0iE8hNTwmKM01PSep6ZQNNqNGQeTUaZP1QaaDSFGjR6QMnqAABkNA
A0NAAACUQmmVPCamymQyeoAAaBoABo0AAylHqPUGgDQxABoAAaGgAAAJJEAmjCMjU9NQ00p5lPTS
aj9R6k0eptTEeo9PRQ8lF521U5byb+oIFbTceMdsqkGT2wkdDJUokaGRygvvdKtLp3NVbBJDJQ++
d0FFUy5DL8ySiwJ2Ar6L2TeMY3nT206PSp5GuRa/2VjFgtqj8rA5q83gsvTTtJlwaojI3HoLtNbH
tv4fPRtED1qVBRUToXWDwJMewv/yHLa6LnEmwHCXKw+t0WOl3BEu+nITCc3O91BWw8cgKUg2H6Sg
XpKIIkySiI2Nnx04hN7fIkNdIESxQBtOfOBftjeGo74MyUmcV2vVSLlucsrgv0EiIjcQs5DUhyM5
BaMhVqMcpiMCrG4yzOYISvEOme8dPKUhpA9Q/GSOnGA1jh4MhQFpKTvTzoylS7k5q5jKPDfmxlKi
5zWEBmtKy7PlsYsISsyTkugcOYjKSb5zxrVsqnialRLMEtjCA5NosuuREuVFKQJOTPQXF9dZu928
H4RgUDxjJgUtnD6ZHFpAzG4CcDt93Z1Q6NBcWhWZFSEHOZkQ7TX3F7C4senrBENkrcd4QGCyaLRF
WswcIMdbkBFjUjUSmwkGMRvUVa6dyjszyPKcsMhxOzvDqZH5N1j+S6x0fJca5d1TWOExRhjg34Zu
1VLCPrR2QDe4ITEOCSVFJLNpy3DzwtAOLnGAbKdH6L9u1OSpHj0T3P2nFMji5uv4bxyKQuPsMcxt
GCnbPiK0OVAk6zhvfJ4MaYwRPBwFqbJdOK7yhZGse1mcTbQ+RFd02vVoISjGXkhRjoJvvujOgMh4
feA0dG3t1iUJVC4S+olF8qID7KNzQvSDBLANA4SQteFJMTBRkEdb0muLYUMl9RrhysIlDWDQSs5o
mhWJsRkhGE9+8QzuzGoFAfEV4wIp8uCeNQEBpSVngoRSbbrI0lXnDwwCAxETTILng/bfR/w2w/Y2
9rLOXeU1pKWnvKz0rn62RTuH5AKvF+1L2EsVvtVYBhK9yJ3AHSB/uJQ1K/W7Apk4BuekuxJSHMTd
ITiWlQnN+EZPPx53wzCJdiCrm84a6DloDAJQHCVqJQ/MjiEmEpQ+erMHviVJ3HVSPkMOAlmPL4BK
S/AcZWF+XZAhqbHVSeiAR2QSzSEaCoh8iRAQkktgXhCwvNwdnpDZ0pKFd4DJcYBRttQ4Iw+I9Uaw
NGrlZhheERIDTdUUQ1n9n8qoNhp7ycvJBzWer0eXXCkqNUgqe8srZPjimC52YKyEPQiTmGGYYeum
UOcKxmAvCJbFPvJhrUrqLrIJBRHTBjApHKQQxFLJq8yDD+w4nj+gidu20kuXUgZ8RpFCgK1HKFcr
x/TEpfyDUPn6COfle9aEHkBiPp0nd2gauMlmVwZqsE4d5uVwHC4lJP/F3JFOFCQInHiogA==

Attachment: signature.asc
Description: This is a digitally signed message part

-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to