diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 20:23:45 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 20:23:45 +0000 |
| commit | e7d668ac9e813bc9922ee7d771848bd8822d5d1f (patch) | |
| tree | 34e2fc7b1c064beaa52e5e05e9278be458be9fba /network | |
| parent | 44a204a75880c342c3ac9066072f102f773a539a (diff) | |
Move D-Bus watch functions into libgdbus
Diffstat (limited to 'network')
| -rw-r--r-- | network/Makefile.am | 4 | ||||
| -rw-r--r-- | network/connection.c | 1 | ||||
| -rw-r--r-- | network/main.c | 3 | ||||
| -rw-r--r-- | network/manager.c | 1 | ||||
| -rw-r--r-- | network/server.c | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/network/Makefile.am b/network/Makefile.am index 5218ce6f..e4b5b317 100644 --- a/network/Makefile.am +++ b/network/Makefile.am @@ -10,12 +10,12 @@ libnetwork_la_SOURCES = main.c \ connection.h connection.c common.h common.c LDADD = $(top_builddir)/common/libhelper.a \ - @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ + @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd diff --git a/network/connection.c b/network/connection.c index b5ef61ba..466dd203 100644 --- a/network/connection.c +++ b/network/connection.c @@ -41,7 +41,6 @@ #include <glib.h> #include "logging.h" -#include "dbus.h" #include "dbus-helper.h" #include "textfile.h" #include "glib-helper.h" diff --git a/network/main.c b/network/main.c index c84ba59b..f710080f 100644 --- a/network/main.c +++ b/network/main.c @@ -29,7 +29,8 @@ #include <sys/socket.h> #include <bluetooth/bluetooth.h> -#include "dbus.h" +#include <glib.h> +#include <dbus/dbus.h> #include "plugin.h" #include "dbus-service.h" diff --git a/network/manager.c b/network/manager.c index 2ad0a97d..14bea175 100644 --- a/network/manager.c +++ b/network/manager.c @@ -40,7 +40,6 @@ #include <glib.h> -#include "dbus.h" #include "dbus-helper.h" #include "logging.h" #include "textfile.h" diff --git a/network/server.c b/network/server.c index 046b20b3..f4fb5176 100644 --- a/network/server.c +++ b/network/server.c @@ -45,7 +45,6 @@ #include <glib.h> #include "logging.h" -#include "dbus.h" #include "error.h" #include "textfile.h" #include "dbus-helper.h" |