/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 revisionview.py

  • Committer: Sabin Iacob (m0n5t3r)
  • Date: 2008-06-04 23:07:26 UTC
  • mfrom: (487.4.4 bug228922)
  • Revision ID: iacobs@m0n5t3r.info-20080604230726-b4zlsgv5pwcoyqcd
https://launchpad.net/bugs/235668
fix seahorse detection in older versions of dbus-python

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionview.py
22
22
import gobject
23
23
import webbrowser
24
24
 
 
25
from bzrlib.plugins.gtk import icon_path
25
26
from bzrlib.osutils import format_date
26
27
from bzrlib.util.bencode import bdecode
27
 
from bzrlib.testament import Testament
28
 
 
29
 
from bzrlib.plugins.gtk import icon_path
30
28
 
31
29
try:
32
30
    from bzrlib.plugins.gtk import seahorse
40
38
PAGE_SIGNATURE = 2
41
39
PAGE_BUGS = 3
42
40
 
 
41
webbrowser.register('sensible-browser', None, webbrowser.GenericBrowser('sensible-browser'), -1)
 
42
webbrowser.register('xdg-open', None, webbrowser.GenericBrowser('xdg-open'), -1)
43
43
 
44
44
def _open_link(widget, uri):
45
 
    for cmd in ['sensible-browser', 'xdg-open']:
46
 
        if webbrowser._iscommand(cmd):
47
 
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
48
45
    webbrowser.open(uri)
49
46
 
50
47
gtk.link_button_set_uri_hook(_open_link)
222
219
                                        "This revision has not been signed.")
223
220
 
224
221
    def show_signature(self, crypttext):
225
 
        (cleartext, key) = seahorse.verify(crypttext)
226
 
 
227
 
        assert cleartext is not None
228
 
 
229
 
        inv = self.repository.get_inventory(self.revision.revision_id)
230
 
        expected_testament = Testament(self.revision, inv).as_short_text()
231
 
        if expected_testament != cleartext:
232
 
            self.signature_image.set_from_file(icon_path("sign-bad.png"))
233
 
            self.signature_label.set_markup("<b>Signature does not match repository data</b>\n" +
234
 
                        "The signature plaintext is different from the expected testament plaintext.")
235
 
            return
 
222
        key = seahorse.verify(crypttext)
236
223
 
237
224
        if key and key.is_available():
238
225
            if key.is_trusted():
334
321
        self._create_general()
335
322
        self._create_relations()
336
323
        # Disabled because testaments aren't verified yet:
337
 
        if has_seahorse:
338
 
            self._create_signature()
 
324
        # if has_seahorse:
 
325
        #    self._create_signature()
339
326
        self._create_file_info_view()
340
327
        self._create_bugs()
341
328