[conduit/syncml: 22/244] Try except guard around the bluez stuff. No guarantees there is a default adaptor..

[John Carr <johncarr src gnome org>]

commit 566d6bad62b73f05e9c995f73c2d2c6f538d5a8d
Author: John Carr <john carr unrouted co uk>
Date:   Tue Apr 14 03:26:10 2009 -0700

    Try except guard around the bluez stuff. No guarantees there is a default adaptor..
---
 conduit/dataproviders/BluetoothFactory.py |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/conduit/dataproviders/BluetoothFactory.py b/conduit/dataproviders/BluetoothFactory.py
index 1de33c2..82b7087 100644
--- a/conduit/dataproviders/BluetoothFactory.py
+++ b/conduit/dataproviders/BluetoothFactory.py
@@ -8,16 +8,19 @@ class BluetoothFactory(SimpleFactory.SimpleFactory):
     def __init__(self, **kwargs):
         SimpleFactory.SimpleFactory.__init__(self, **kwargs)
 
-        self.bus = dbus.SystemBus()
-        self.bluez = dbus.Interface(self.bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+        try:
+            self.bus = dbus.SystemBus()
+            self.bluez = dbus.Interface(self.bus.get_object("org.bluez", "/"), "org.bluez.Manager")
 
-        adapter_path = self.bluez.DefaultAdapter()
-        self.adapter = dbus.Interface(self.bus.get_object("org.bluez", adapter_path), "org.bluez.Adapter")
+            adapter_path = self.bluez.DefaultAdapter()
+            self.adapter = dbus.Interface(self.bus.get_object("org.bluez", adapter_path), "org.bluez.Adapter")
 
-        self.adapter.connect_to_signal("DeviceCreated", self._device_created)
-        # self.adapter.connect_to_signal("DeviceRemoved", self._device_removed)
+            self.adapter.connect_to_signal("DeviceCreated", self._device_created)
+            # self.adapter.connect_to_signal("DeviceRemoved", self._device_removed)
 
-        # FIXME: Need to listen to property changes and not show paired devices?
+            # FIXME: Need to listen to property changes and not show paired devices?
+        except:
+            pass
 
     def _maybe_new(self, device):
         properties = device.GetProperties()
@@ -39,9 +42,12 @@ class BluetoothFactory(SimpleFactory.SimpleFactory):
         self._maybe_new(device)
 
     def probe(self):
-        for device_path in self.adapter.ListDevices():
-            device = dbus.Interface(self.bus.get_object("org.bluez", device_path), "org.bluez.Device")
-            self._maybe_new(device) 
+        try:
+            for device_path in self.adapter.ListDevices():
+                device = dbus.Interface(self.bus.get_object("org.bluez", device_path), "org.bluez.Device")
+                self._maybe_new(device) 
+        except:
+            pass
 
     def get_args(self, id, **kwargs):
         return (id, )