diff options
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index b42e2d76..f890bf04 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,5 @@ +2006-10-28: + - catch errors when load_icon() does not work 2006-10-26: - make sure that xserver-xorg-video-all get installed if xserver-xorg-driver-all was installed before (lp: #58424) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 97a57772..a34e90f6 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -323,7 +323,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): logging.warning("Error setting locales (%s)" % e) icons = gtk.icon_theme_get_default() - gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) + try: + gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) + except gobject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass SimpleGladeApp.__init__(self, gladedir+"/DistUpgrade.glade", None, domain="update-manager") self.prev_step = 0 # keep a record of the latest step |