=== modified file 'GTG/core/plugins/engine.py' --- GTG/core/plugins/engine.py 2010-07-29 10:36:24 +0000 +++ GTG/core/plugins/engine.py 2010-09-04 21:19:42 +0000 @@ -88,7 +88,7 @@ self.error = True else: if dbobj: - self.missing_dbus.append((dbobj)) + self.missing_dbus.append(dbobj) self.error = True def _check_module_depends(self): === modified file 'GTG/gtk/preferences.py' --- GTG/gtk/preferences.py 2010-07-29 13:41:28 +0000 +++ GTG/gtk/preferences.py 2010-09-04 21:43:12 +0000 @@ -78,19 +78,18 @@ modules = plugin.missing_modules dbus = plugin.missing_dbus # convert to strings - if len(modules) > 0: + if modules: modules = "%s" % ', '.join(modules) - if len(dbus) > 0: - ifaces = ["%s:%s" % (a,b) for (a,b) in dbus] + if dbus: + ifaces = ["%s:%s" % (a, b) for (a, b) in dbus] dbus = "%s" % ', '.join(ifaces) - print dbus, len(dbus) # combine - if len(modules) > 0 and len(dbus) == 0: - text += '\n'.join([GnomeConfig.MODULEMISSING, '', modules]) - elif len(modules) == 0 and len(dbus) > 0: - text += '\n'.join([GnomeConfig.DBUSMISSING, '', dbus]) - elif len(modules) > 0 and len(dbus) > 0: - text += '\n'.join([GnomeConfig.MODULANDDBUS, '', modules, dbus]) + if modules and not dbus: + text += '\n'.join((GnomeConfig.MODULEMISSING, modules)) + elif dbus and not modules: + text += '\n'.join((GnomeConfig.DBUSMISSING, dbus)) + elif modules and dbus: + text += '\n'.join((GnomeConfig.MODULANDDBUS, modules, dbus)) else: text += GnomeConfig.UNKNOWN return text