diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-06-03 12:54:26 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-06-03 12:54:26 +0000 |
commit | 9162dfde2d6a7625849aa873fc5ef9220779e7a9 (patch) | |
tree | c55f26324f76f01837f82b560615f139cffef34f | |
parent | e0a54a416a5abc3bab139e5db6391c1926855ff6 (diff) |
Move D-Bus config file and example clients back into hcid directory
-rw-r--r-- | daemon/Makefile.am | 8 | ||||
-rw-r--r-- | hcid/Makefile.am | 10 | ||||
-rw-r--r-- | hcid/bluetooth.conf (renamed from daemon/bluetooth.conf) | 3 | ||||
-rwxr-xr-x | hcid/simple-service (renamed from daemon/test-database) | 8 | ||||
-rwxr-xr-x | hcid/test-manager (renamed from daemon/test-manager) | 0 |
5 files changed, 13 insertions, 16 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a3354221..02742923 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,10 +1,2 @@ -if CONFIGFILES -dbusdir = $(sysconfdir)/dbus-1/system.d - -dbus_DATA = bluetooth.conf -endif - -EXTRA_DIST = bluetooth.conf test-manager test-database - MAINTAINERCLEANFILES = Makefile.in diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 9ecd1f97..4cba3e03 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -1,5 +1,9 @@ if CONFIGFILES +dbusdir = $(sysconfdir)/dbus-1/system.d + +dbus_DATA = bluetooth.conf + confdir = $(sysconfdir)/bluetooth conf_DATA = hcid.conf @@ -52,9 +56,9 @@ AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = hcid.8 hcid.conf.5 hcid.conf dbus-api.txt \ - list-devices test-discovery test-adapter test-device simple-agent \ - service-record.dtd \ +EXTRA_DIST = bluetooth.conf hcid.8 hcid.conf.5 hcid.conf dbus-api.txt \ + list-devices test-discovery itest-manager test-adapter test-device \ + simple-service simple-agent service-record.dtd \ service-did.xml service-spp.xml service-opp.xml service-ftp.xml MAINTAINERCLEANFILES = Makefile.in diff --git a/daemon/bluetooth.conf b/hcid/bluetooth.conf index aa642a2a..e2f4e923 100644 --- a/daemon/bluetooth.conf +++ b/hcid/bluetooth.conf @@ -1,5 +1,5 @@ <!-- This configuration file specifies the required security policies - for Bluetooth core service to work. --> + for Bluetooth core daemon to work. --> <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> @@ -15,6 +15,7 @@ <allow send_destination="org.bluez.Manager"/> <allow receive_sender="org.bluez.Manager"/> + <allow send_path="/"/> <allow send_path="/org/bluez"/> <allow send_destination="org.bluez.Adapter"/> diff --git a/daemon/test-database b/hcid/simple-service index 44a872a9..4c2bce4e 100755 --- a/daemon/test-database +++ b/hcid/simple-service @@ -101,10 +101,10 @@ xml = ' \ </record> \ ' -database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), - 'org.bluez.Database') +adapter = dbus.Interface(bus.get_object('org.bluez', '/'), + 'org.bluez.Adapter') -handle = database.AddServiceRecordFromXML(xml) +handle = adapter.AddServiceRecord(xml) print "Service record with handle 0x%04x added" % (handle) @@ -116,4 +116,4 @@ try: except: pass -database.RemoveServiceRecord(dbus.UInt32(handle)) +adapter.RemoveServiceRecord(dbus.UInt32(handle)) diff --git a/daemon/test-manager b/hcid/test-manager index 759b6a48..759b6a48 100755 --- a/daemon/test-manager +++ b/hcid/test-manager |