# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1458585856 -3600
# Node ID 05a5a125a238e3a87b4404474826fd1256dd3968
# Parent  72837638f0761a42cff3dd276b1c6ad1c5900505
bridge (frontend): raise a BridgeExceptionNoService on org.freedesktop.DBus.Error.Spawn.ExecFailed D-Bus error

diff -r 72837638f076 -r 05a5a125a238 frontends/src/bridge/DBus.py
--- a/frontends/src/bridge/DBus.py	Mon Mar 21 17:00:39 2016 +0100
+++ b/frontends/src/bridge/DBus.py	Mon Mar 21 19:44:16 2016 +0100
@@ -70,7 +70,8 @@
             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 -r 72837638f076 -r 05a5a125a238 src/bridge/DBus.py
--- a/src/bridge/DBus.py	Mon Mar 21 17:00:39 2016 +0100
+++ b/src/bridge/DBus.py	Mon Mar 21 19:44:16 2016 +0100
@@ -192,7 +192,7 @@
 
     @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 @@
     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 -r 72837638f076 -r 05a5a125a238 src/bridge/bridge_constructor/dbus_frontend_template.py
--- a/src/bridge/bridge_constructor/dbus_frontend_template.py	Mon Mar 21 17:00:39 2016 +0100
+++ b/src/bridge/bridge_constructor/dbus_frontend_template.py	Mon Mar 21 19:44:16 2016 +0100
@@ -70,7 +70,8 @@
             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"))