Rev 513: Return cleartext from seahorse module in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 513
revision-id: jelmer at samba.org-20080629190723-l8mzg9x4oec0lhsl
parent: jelmer at samba.org-20080629190444-3hhmoc5fsoknrvet
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-06-29 21:07:23 +0200
message:
  Return cleartext from seahorse module
modified:
  revisionview.py                logview.py-20051024072750-4d5c28cb73611027
  seahorse.py                    crypt.py-20080401000513-m7ksudqlvqbdfejf-1
=== modified file 'revisionview.py'
--- a/revisionview.py	2008-06-29 19:04:44 +0000
+++ b/revisionview.py	2008-06-29 19:07:23 +0000
@@ -220,7 +220,7 @@
                                         "This revision has not been signed.")
 
     def show_signature(self, crypttext):
-        key = seahorse.verify(crypttext)
+        (cleartext, key) = seahorse.verify(crypttext)
 
         if key and key.is_available():
             if key.is_trusted():

=== modified file 'seahorse.py'
--- a/seahorse.py	2008-06-20 03:33:17 +0000
+++ b/seahorse.py	2008-06-29 19:07:23 +0000
@@ -85,7 +85,10 @@
         if key not in keyset:
             keyset[key] = Key(key)
 
-        return keyset[key]
+        return (cleartext, keyset[key])
+
+    return (cleartext, None)
+
 
 class Key: