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

  • Committer: Vincent Ladeuil
  • Date: 2009-06-15 14:02:08 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: v.ladeuil+lp@free.fr-20090615140208-k5zg9c0vttrr9se8
Integrater Jelmer patch and implement a more robust solution.

* ui.py:
(GtkUIFactory._progress_all_finished): *Don't* uninstall the
widget.

* branchview/treeview.py:
(TreeView.__init__): Unconditionally install the progress widget
that will remain active until someone else install one or the
TreeView is destroyed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
40
40
        name = get_name()
41
41
    else:
42
42
        name = getattr(e, '_dbus_error_name', None)
43
 
 
 
43
        
44
44
    if name is None:
45
45
        args = getattr(e, 'args', None) # This is case for old python-dbus-0.62
46
46
        if args == ("Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)",):
47
47
            raise ImportError
48
 
 
 
48
        
49
49
    # DBus sometimes fails like this, just treat it as if seahorse is not
50
50
    # available rather than crashing.
51
51
    if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed", 
52
 
                "org.freedesktop.DBus.Error.ServiceUnknown",
53
 
                "org.freedesktop.DBus.Error.NotSupported"):
 
52
                "org.freedesktop.DBus.Error.ServiceUnknown"):
54
53
        raise ImportError
55
54
    else:
56
55
        raise