diff --git a/frontends/src/bridge/DBus.py b/frontends/src/bridge/DBus.py index ab9467ad..a1949f2a 100644 --- a/frontends/src/bridge/DBus.py +++ b/frontends/src/bridge/DBus.py @@ -70,7 +70,8 @@ class DBusBridgeFrontend(BridgeFrontend): self.db_plugin_iface = dbus.Interface(self.db_object, dbus_interface=const_INT_PREFIX + const_PLUGIN_SUFFIX) except dbus.exceptions.DBusException, e: - if e._dbus_error_name == 'org.freedesktop.DBus.Error.ServiceUnknown': + if e._dbus_error_name in ('org.freedesktop.DBus.Error.ServiceUnknown', + 'org.freedesktop.DBus.Error.Spawn.ExecFailed'): raise BridgeExceptionNoService elif e._dbus_error_name == 'org.freedesktop.DBus.Error.NotSupported': log.error(_(u"D-Bus is not launched, please see README to see instructions on how to launch it")) diff --git a/src/bridge/DBus.py b/src/bridge/DBus.py index 5a7c0307..ee6a2b86 100755 --- a/src/bridge/DBus.py +++ b/src/bridge/DBus.py @@ -192,7 +192,7 @@ class DbusObject(dbus.service.Object): @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='sss') - def progressError(self, error, profile, arg_2): + def progressError(self, id, error, profile): pass @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, @@ -641,8 +641,8 @@ class DBusBridge(Bridge): def presenceUpdate(self, entity_jid, show, priority, statuses, profile): self.dbus_bridge.presenceUpdate(entity_jid, show, priority, statuses, profile) - def progressError(self, error, profile, arg_2): - self.dbus_bridge.progressError(error, profile, arg_2) + def progressError(self, id, error, profile): + self.dbus_bridge.progressError(id, error, profile) def progressFinished(self, id, metadata, profile): self.dbus_bridge.progressFinished(id, metadata, profile) diff --git a/src/bridge/bridge_constructor/dbus_frontend_template.py b/src/bridge/bridge_constructor/dbus_frontend_template.py index 4567cd33..f5986527 100644 --- a/src/bridge/bridge_constructor/dbus_frontend_template.py +++ b/src/bridge/bridge_constructor/dbus_frontend_template.py @@ -70,7 +70,8 @@ class DBusBridgeFrontend(BridgeFrontend): self.db_plugin_iface = dbus.Interface(self.db_object, dbus_interface=const_INT_PREFIX + const_PLUGIN_SUFFIX) except dbus.exceptions.DBusException, e: - if e._dbus_error_name == 'org.freedesktop.DBus.Error.ServiceUnknown': + if e._dbus_error_name in ('org.freedesktop.DBus.Error.ServiceUnknown', + 'org.freedesktop.DBus.Error.Spawn.ExecFailed'): raise BridgeExceptionNoService elif e._dbus_error_name == 'org.freedesktop.DBus.Error.NotSupported': log.error(_(u"D-Bus is not launched, please see README to see instructions on how to launch it"))