deskbar-applet r2020 - in branches/gnome-2-22: . deskbar/ui/preferences

[sebp svn gnome org]

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

Log:
Catch dbus.DBusException in __is_nsm_available()
Apparently, the exception might appear here.
(fixes bug #479397, #447147 and #492530)

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/deskbar/ui/preferences/DeskbarPreferences.py

Modified: branches/gnome-2-22/deskbar/ui/preferences/DeskbarPreferences.py
==============================================================================
--- branches/gnome-2-22/deskbar/ui/preferences/DeskbarPreferences.py	(original)
+++ branches/gnome-2-22/deskbar/ui/preferences/DeskbarPreferences.py	Wed Mar 19 19:41:24 2008
@@ -149,7 +149,7 @@
             _dbus.ReloadConfig()
             bus_names = _dbus.ListActivatableNames()
             return (NewStuffUpdater.NEW_STUFF_SERVICE in bus_names)
-        except dbus.exceptions.DBusException:
+        except (dbus.DBusException, dbus.exceptions.DBusException):
             return False
 
     def __enable_newstuffmanager(self, status):