diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 14:30:42 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 14:30:42 +0000 |
| commit | 818744abec2065fd03ee872b671bb21ff2957ac9 (patch) | |
| tree | 3578317ca93eab354e50df75b6bfeec8b86aa3fc | |
| parent | 0e6a5eb8fc4b7e64e39031e5744e1079492d4c13 (diff) | |
Don't use a D-Bus well known name at the moment
| -rw-r--r-- | input/Makefile.am | 8 | ||||
| -rw-r--r-- | input/bluetooth-input.conf | 21 | ||||
| -rw-r--r-- | input/input-service.c | 3 |
3 files changed, 2 insertions, 30 deletions
diff --git a/input/Makefile.am b/input/Makefile.am index 6565d8c1..80428b0a 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,10 +1,4 @@ -if CONFIGFILES -dbusdir = $(sysconfdir)/dbus-1/system.d - -dbus_DATA = bluetooth-input.conf -endif - servicedir = $(libdir)/bluetooth noinst_PROGRAMS = bluetoothd-service-input @@ -19,6 +13,6 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -EXTRA_DIST = bluetooth-input.conf +EXTRA_DIST = input-api.txt MAINTAINERCLEANFILES = Makefile.in diff --git a/input/bluetooth-input.conf b/input/bluetooth-input.conf deleted file mode 100644 index 90643f74..00000000 --- a/input/bluetooth-input.conf +++ /dev/null @@ -1,21 +0,0 @@ -<!-- This configuration file specifies the required security policies - for Bluetooth input service to work. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- ../system.conf have denied everything, so we just punch some holes --> - - <policy user="root"> - <allow own="org.bluez.input"/> - </policy> - - <policy at_console="true"> - <allow send_destination="org.bluez.Input"/> - <allow receive_sender="org.bluez.Input"/> - - <allow send_path="/org/bluez/input"/> - </policy> - -</busconfig> diff --git a/input/input-service.c b/input/input-service.c index 5b9f5204..fcb18352 100644 --- a/input/input-service.c +++ b/input/input-service.c @@ -44,7 +44,6 @@ #include "textfile.h" #include "input-service.h" -#define INPUT_SERVICE "org.bluez.input" #define INPUT_PATH "/org/bluez/input" #define INPUT_MANAGER_INTERFACE "org.bluez.input.Manager" #define INPUT_DEVICE_INTERFACE "org.bluez.input.Device" @@ -688,7 +687,7 @@ int input_dbus_init(void) DBusError derr; const char *adapter; - connection = init_dbus(INPUT_SERVICE, NULL, NULL); + connection = init_dbus(NULL, NULL, NULL); if (!connection) return -1; |