deskbar-applet r2019 - in trunk: . deskbar/core/updater

[sebp svn gnome org]

Author: sebp
Date: Wed Mar 19 19:38:14 2008
New Revision: 2019
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2019&view=rev

Log:
Catch dbus.DBusException in is_capuchin_available()
Apparently, the exception might appear here.

Modified:
   trunk/ChangeLog
   trunk/deskbar/core/updater/Capuchin.py

Modified: trunk/deskbar/core/updater/Capuchin.py
==============================================================================
--- trunk/deskbar/core/updater/Capuchin.py	(original)
+++ trunk/deskbar/core/updater/Capuchin.py	Wed Mar 19 19:38:14 2008
@@ -22,7 +22,7 @@
         _dbus.ReloadConfig()
         bus_names = _dbus.ListActivatableNames()
         return (CAPUCHIN_DBUS_SERVICE in bus_names)
-    except dbus.exceptions.DBusException, e:
+    except (dbus.DBusException, dbus.exceptions.DBusException), e:
         LOGGER.exception("D-Bus Error: %s" % e)
         return False