From 317cefac52b5bde2070893ecc908654099a7a2ad Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 28 Jun 2008 10:01:10 +0200
Subject: [PATCH] Export the D-Bus service and interface constants

---
 include/Makefile.am |  4 +++-
 include/dbus.h      | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/connman.h       | 18 +-----------------
 src/iface-inet.c    |  1 +
 4 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 include/dbus.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 4c10f17..15af374 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,9 @@
 
 includedir = @includedir@/connman
 
-noinst_HEADERS = log.h plugin.h iface.h rtnl.h dhcp.h resolver.h
+include_HEADERS = log.h plugin.h dbus.h
+
+noinst_HEADERS = iface.h rtnl.h dhcp.h resolver.h
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/include/dbus.h b/include/dbus.h
new file mode 100644
index 0000000..21efdf5
--- /dev/null
+++ b/include/dbus.h
@@ -0,0 +1,49 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+#ifndef __CONNMAN_DBUS_H
+#define __CONNMAN_DBUS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <dbus/dbus.h>
+
+#define CONNMAN_SERVICE  "org.freedesktop.connman"
+
+#define CONNMAN_ERROR_INTERFACE  CONNMAN_SERVICE ".Error"
+
+#define CONNMAN_AGENT_INTERFACE  CONNMAN_SERVICE ".Agent"
+
+#define CONNMAN_MANAGER_PATH       "/"
+#define CONNMAN_MANAGER_INTERFACE  CONNMAN_SERVICE ".Manager"
+
+#define CONNMAN_IFACE_BASEPATH  "/interface"
+#define CONNMAN_IFACE_INTERFACE  CONNMAN_SERVICE ".Interface"
+
+#define CONNMAN_NETWORK_INTERFACE  CONNMAN_SERVICE ".Network"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CONNMAN_DBUS_H */
diff --git a/src/connman.h b/src/connman.h
index 866f9c9..e04ddf5 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -19,25 +19,9 @@
  *
  */
 
-#include <stdio.h>
-
 #include <glib.h>
 
-#include <dbus/dbus.h>
-
-#define CONNMAN_SERVICE  "org.freedesktop.connman"
-
-#define CONNMAN_ERROR_INTERFACE  CONNMAN_SERVICE ".Error"
-
-#define CONNMAN_AGENT_INTERFACE  CONNMAN_SERVICE ".Agent"
-
-#define CONNMAN_MANAGER_PATH       "/"
-#define CONNMAN_MANAGER_INTERFACE  CONNMAN_SERVICE ".Manager"
-
-#define CONNMAN_IFACE_BASEPATH  "/interface"
-#define CONNMAN_IFACE_INTERFACE  CONNMAN_SERVICE ".Interface"
-
-#define CONNMAN_NETWORK_INTERFACE  CONNMAN_SERVICE ".Network"
+#include <connman/dbus.h>
 
 #define NM_SERVICE    "org.freedesktop.NetworkManager"
 #define NM_PATH       "/org/freedesktop/NetworkManager"
diff --git a/src/iface-inet.c b/src/iface-inet.c
index 82a1e8c..cd21c13 100644
--- a/src/iface-inet.c
+++ b/src/iface-inet.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-- 
2.7.4