Attachment 306582 Details for Bug 448193 – Patch from upstream

[patch] Patch from upstream

bzr-gtk-more-better-seahorse-dbus-check.patch (text/plain), 3.26 KB, created by Toshio Ernie Kuratomi on 2008-05-24 15:32:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2008-05-24 15:32:22 UTC

Size: 3.26 KB

patch

obsolete

># Bazaar merge directive format 2 (Bazaar 0.90)
># revision_id: iacobs@m0n5t3r.info-20080523082359-wsbcvw5khcasf53b
># target_branch: file:///home/iacobs/tmp/bzr-gtk/
># testament_sha1: ed3fcbe8c1a318583647d8e055cb1f9813212e98
># timestamp: 2008-05-23 11:24:09 +0300
># base_revision_id: jelmer@samba.org-20080504202356-64wc0mcpsqd708xq
># 
># Begin patch
>=== modified file 'seahorse.py'
>--- seahorse.py	2008-05-01 21:49:50 +0000
>+++ seahorse.py	2008-05-23 08:23:59 +0000
>@@ -28,21 +28,17 @@
> KEY_TYPE_OPENPGP = 'openpgp'
> KEY_TYPE_SSH = 'ssh'
> 
>-try:
>-    dbus.validate_bus_name(BUS_NAME)
>-except ValueError:
>-    # Seahorse isn't installed
>-    raise ImportError
>-except AttributeError:
>-    # Outdated version of DBus that doesn't have validate_bus_name
>-    raise ImportError
>-
> 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)
>+try: 
>+    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:
>+    if e.get_dbus_name() == 'org.freedesktop.DBus.Error.ServiceUnknown':
>+        raise ImportError
>+    raise
> 
> FLAG_VALID = 0x0001
> FLAG_CAN_ENCRYPT = 0x0002
>
># Begin bundle
>IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT2vVE0AAwR/gEQQAGBR5///
>f+PeIL////BQBc9IAAUAAADwlNU0FPU9EfqnqDymj1PUAAAAGnqNpqaD1DjJkyYjEwAmTBMgBowj
>AEMBxkyZMRiYATJgmQA0YRgCGAjSiZBkNB6mIaGgBpoBpoAaAaAVSJoTQyAAQ0EaaaU/KGKfok0Y
>R5J6m1HjEbGnrUU1B45ckt55EGIwV0QwOpmGhBDTiKivOVSiLpQUpmpoVurnZYq1XxGGEwxRGR25
>s7ifNnECSRbYxmhJAQ8EJNOhyiouwvyzGw5EA8w/EWaNrpy8ktcOEbaJUCvgA3T83ukpKTPK3XKO
>qdKquVWwilKNKiDi5t8pbdqSqPTJLa8vzdKi7gaj6l4d8Y3tRH8vUjXVOfd2Fm1PHrmog4lTabTh
>w1abJzn8UObRLEJyJyl46HTTodRQ8RFpZOKTrJRbvVFJIWkkXLKKCKkWRaxFfsqeEfYhRD4L0LZs
>Zjxd7wxEL0KXIrW/HGszb5T1PdM+ZksL0770mTBlnJyoa08kYyp1thDHPUIujV54MrCW1PmuZUKM
>EdDdG5GtkycE04JMqpapkZFiFRm0KhlxM6bapCLVbEpUtwvdSFyODEkkqIV248y6KFCeRkkoirOr
>Z21wirFeamRpZSWkyasLpIjZSZliSMuJ6kamtfH4oTZ1jGVo0pPujt7CGVRdFzYxOCbUzuUa6LFk
>NLGmRnXZYx0hYyob25pXLGJmTRrZGNjcy3JjpxpehFKTRUoqZ1aS5ordN7NF1xoaGNx45cIsjC4n
>ciVbCtqZciWpjV42db6dtlcosZ6onEzEilxdEV9Rx9X5FaRHvSPPgzvBmmxk/WkqcY65JSia3k+R
>sZ1StMSCHDiAYJQxnyWkT2QybtOuxvc9XnUWGQlmPq3WaPorVvsxxYyqmD6P4stVvq1vs/lc0vs4
>sLWDM/s4aV9PslPZW6USiNtSpP9edEpOz0JUH4MTxe54v0UVtnx+D9dT5vR5+t8kGll2HlETiSnf
>Q3w3K2CGjIhpR84dNb9kj0cEknJ8lpw4Wtbi0o/4bY0MFySD1L4/JL0fhB/mLz0druRrdGD9EnP+
>uh9SxTsxIW1NkyFHKPzbn7WNCJau91sbrYQ3oWuiLHNcixnG5c0R8f3Q8GF+c9Z1cTs7Xf0zyOVT
>Cijb41vWnfKmCtwb2PctZT+DFyPax4K4i9vd2iNET/pizss3764wLDDf90VoWmzVY1EmbEPPmW2I
>1xjDr93BkRYxaWcvRpe17GVJrMxcfRmYOvpiCcNHkyQ7HbEKRj3f0+rlGsfRGSq6MyOFSGxDy+zz
>eZK6JJxLT2S2PcMh58TfyRQn4NURp4IPy6VSxuYpIiTczhs7V9jxwbdsncd/KL0vJG6I3/gZfJC/
>zqRNDuRrdiHqZjuWLjk+6C07IXHhEoWnc5rzkzrG8+NcUfCRjISI29ZquWxFaUQZn6eXrtsZU0Wy
>Qkjs6pIOpekg2e+ax7JREdiSvF4TQnEdngf9yw98eSxGi3VPk39LpdKKFcFs7u61aSa43fIlEtCP
>H3HsibrQ4ntz1fB0KpoMgnEcvv5KuXWuQ1PNxbEkVMjFCVs4dE945v2VlhKUJFknCHHokj4zsWEm
>hBWq4HuPFHqXxo/F27USNRYEl+RGqJopXEeBK2vv1JnvQ5kO95LTPljuNaSWZuajE4YiovjIloui
>MUR0yLZI1JndWcXNP81UJStRZoDMbEetHzjT5owtdMtBvgyCxMkggkEiMBADZiWJkkqBfxdyRThQ
>kD2vVE0=

Actions: View | Diff

Attachments on bug 448193: 306582