import dbus

bus = dbus.SystemBus()


dummy = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.freedesktop.DBus.Introspectable')

#print dummy.Introspect()


manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')

try:
	adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter')
except:
	pass

import dbus

bus = dbus.SystemBus()


dummy = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.freedesktop.DBus.Introspectable')

#print dummy.Introspect()


manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')

database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Database')


try:
	adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter')

	test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test')

	rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM')
except:
	adapter = ""

	test = ""

	rfcomm = ""


def create_service(identifier):
	try:
		path = manager.FindService(identifier)
	except:
		path = ""

	if (path != ""):
		return dbus.Interface(bus.get_object('org.bluez', path), 'org.bluez.Service')

echo = create_service("echo")

transfer = create_service("transfer")

network = create_service("network")

input = create_service("input")

audio = create_service("audio")

headset = create_service("headset")


def connect_service(identifier):
	try:
		conn = manager.ActivateService(identifier)
	except:
		conn = ""

	if (conn != ""):
		return dbus.Interface(bus.get_object(conn, "/org/bluez/" + identifier), 'org.bluez.' + identifier + '.Manager')

--- 
+++ 
@@ -3,57 +3,14 @@
 bus = dbus.SystemBus()
 
 
-dummy = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.freedesktop.DBus.Introspectable')
+dummy = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.freedesktop.DBus.Introspectable')
 
 #print dummy.Introspect()
 
 
-manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
-
-database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Database')
-
+manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')
 
 try:
 	adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter')
-
-	test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test')
-
-	rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM')
 except:
-	adapter = ""
-
-	test = ""
-
-	rfcomm = ""
-
-
-def create_service(identifier):
-	try:
-		path = manager.FindService(identifier)
-	except:
-		path = ""
-
-	if (path != ""):
-		return dbus.Interface(bus.get_object('org.bluez', path), 'org.bluez.Service')
-
-echo = create_service("echo")
-
-transfer = create_service("transfer")
-
-network = create_service("network")
-
-input = create_service("input")
-
-audio = create_service("audio")
-
-headset = create_service("headset")
-
-
-def connect_service(identifier):
-	try:
-		conn = manager.ActivateService(identifier)
-	except:
-		conn = ""
-
-	if (conn != ""):
-		return dbus.Interface(bus.get_object(conn, "/org/bluez/" + identifier), 'org.bluez.' + identifier + '.Manager')
+	pass
Remove old 3.x API cruft
