From a150d9e7c463681939b9a5620b43d4d2af8552de Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 1 Mar 2015 00:19:28 -0800
Subject: [PATCH] obexd: Fix includes for gdbus.h header

---
 obexd/client/dbus.c       | 3 ++-
 obexd/client/driver.c     | 3 ++-
 obexd/client/ftp.c        | 2 +-
 obexd/client/manager.c    | 3 ++-
 obexd/client/map-event.c  | 3 ++-
 obexd/client/opp.c        | 3 ++-
 obexd/client/session.c    | 5 +++--
 obexd/client/session.h    | 1 -
 obexd/client/sync.c       | 3 ++-
 obexd/client/transfer.c   | 5 +++--
 obexd/plugins/bluetooth.c | 5 +++--
 obexd/plugins/pcsuite.c   | 3 ++-
 obexd/plugins/vcard.c     | 3 ++-
 obexd/src/main.c          | 2 +-
 obexd/src/manager.c       | 4 ++--
 15 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c
index 243af5972..323202099 100644
--- a/obexd/client/dbus.c
+++ b/obexd/client/dbus.c
@@ -24,7 +24,8 @@
 #endif
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 #include "dbus.h"
diff --git a/obexd/client/driver.c b/obexd/client/driver.c
index a98dcf4d3..0e1421aa4 100644
--- a/obexd/client/driver.c
+++ b/obexd/client/driver.c
@@ -28,7 +28,8 @@
 #include <string.h>
 #include <errno.h>
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "transfer.h"
 #include "session.h"
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
index fa85708e9..02465809a 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <gdbus/gdbus.h>
+#include "gdbus/gdbus.h"
 
 #include "dbus.h"
 #include "log.h"
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 7ae111ca7..e47c861fa 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -32,7 +32,8 @@
 #include <syslog.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 #include "transfer.h"
diff --git a/obexd/client/map-event.c b/obexd/client/map-event.c
index d4249244e..5a16ad26d 100644
--- a/obexd/client/map-event.c
+++ b/obexd/client/map-event.c
@@ -30,10 +30,11 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
+#include "gdbus/gdbus.h"
+
 #include "log.h"
 #include "map-event.h"
 
-#include <gdbus/gdbus.h>
 #include "transfer.h"
 #include "session.h"
 
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index d6fd1c617..eb001e003 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -26,7 +26,8 @@
 #endif
 
 #include <errno.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 
diff --git a/obexd/client/session.c b/obexd/client/session.c
index a6dbcb5eb..ba01ea4f8 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -35,8 +35,9 @@
 #include <sys/stat.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
-#include <gobex/gobex.h>
+
+#include "gdbus/gdbus.h"
+#include "gobex/gobex.h"
 
 #include "dbus.h"
 #include "log.h"
diff --git a/obexd/client/session.h b/obexd/client/session.h
index 35899bc78..b561b7e58 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
 struct obc_session;
 
diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index 1a4b482cf..a9f560544 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -30,7 +30,8 @@
 #include <string.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "log.h"
 
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index c31a722f9..5716a3f85 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -36,8 +36,9 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
-#include <gobex/gobex.h>
+
+#include "gdbus/gdbus.h"
+#include "gobex/gobex.h"
 
 #include "dbus.h"
 #include "log.h"
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 8ca0c8159..c3f23573f 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -34,12 +34,13 @@
 #include <sys/socket.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
 #include "lib/bluetooth.h"
 #include "lib/uuid.h"
-#include "btio/btio.h"
 
+#include "gdbus/gdbus.h"
+
+#include "btio/btio.h"
 #include "obexd.h"
 #include "plugin.h"
 #include "server.h"
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 6460aa9ec..8ca2dcbfa 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -39,7 +39,8 @@
 #include <inttypes.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "obexd.h"
 #include "plugin.h"
diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c
index aaa126bff..37f7c8511 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -31,7 +31,8 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "vcard.h"
 
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 0040c1e75..c774cda50 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -42,7 +42,7 @@
 #include <syslog.h>
 #include <glib.h>
 
-#include <gdbus/gdbus.h>
+#include "gdbus/gdbus.h"
 
 #include "../client/manager.h"
 
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 97ae278da..371f12794 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -29,11 +29,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <gdbus/gdbus.h>
 #include <sys/socket.h>
 #include <inttypes.h>
 
-#include <gobex/gobex.h>
+#include "gdbus/gdbus.h"
+#include "gobex/gobex.h"
 
 #include "btio/btio.h"
 #include "obexd.h"
-- 
2.47.3