Diff between 7c62ddb6099a901326ac878e9742e667fd393023 and eba1c40cb52dcb1cd548d920a6a829bbae12143c

Changed Files

File Additions Deletions Status
Makefile.am +1 -2 modified
plugins/dbusoob.c +0 -1 modified
plugins/neard.c +0 -1 modified
src/event.c +0 -55 deleted
src/event.h +0 -23 deleted
src/mgmt.c +0 -1 modified

Full Patch

diff --git a/Makefile.am b/Makefile.am
index e55113a..e95ba1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -278,8 +278,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
 			src/profile.h src/profile.c \
 			src/device.h src/device.c src/attio.h \
 			src/dbus-common.c src/dbus-common.h \
-			src/event.h src/event.c src/eir.h src/eir.c \
-			src/mgmt.c src/mgmt.h
+			src/eir.h src/eir.c src/mgmt.c src/mgmt.h
 src_bluetoothd_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
 								-ldl -lrt
 src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 3379f73..9dfca46 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -42,7 +42,6 @@
 #include "device.h"
 #include "manager.h"
 #include "dbus-common.h"
-#include "event.h"
 #include "error.h"
 #include "storage.h"
 
diff --git a/plugins/neard.c b/plugins/neard.c
index 114d59c..124b97a 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -41,7 +41,6 @@
 #include "eir.h"
 #include "agent.h"
 #include "hcid.h"
-#include "event.h"
 
 #define NEARD_NAME "org.neard"
 #define NEARD_PATH "/"
diff --git a/src/event.c b/src/event.c
deleted file mode 100644
index 03c3853..0000000
--- a/src/event.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2010  Nokia Corporation
- *  Copyright (C) 2004-2010  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/mgmt.h>
-
-#include <glib.h>
-#include <dbus/dbus.h>
-
-#include "log.h"
-
-#include "adapter.h"
-#include "manager.h"
-#include "device.h"
-#include "error.h"
-#include "dbus-common.h"
-#include "agent.h"
-#include "storage.h"
-#include "event.h"
diff --git a/src/event.h b/src/event.h
deleted file mode 100644
index fa1fa02..0000000
--- a/src/event.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2006-2010  Nokia Corporation
- *  Copyright (C) 2004-2010  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
diff --git a/src/mgmt.c b/src/mgmt.c
index 5b31cf7..4196bdd 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -49,7 +49,6 @@
 #include "adapter.h"
 #include "manager.h"
 #include "device.h"
-#include "event.h"
 #include "eir.h"
 #include "storage.h"
 #include "mgmt.h"