Remove dbus-glib APIs and headers

[Problem] Unused deprecated dbus-glib code
[Cause & Measure] removed dbus-glib codes

Change-Id: I6d3108ec83e724ff41e111052489225ed92f476c

diff --git a/bt-api/CMakeLists.txt b/bt-api/CMakeLists.txt
index d7778a1..2ce21dd 100644 (file)
--- a/bt-api/CMakeLists.txt
+++ b/bt-api/CMakeLists.txt
@@ -52,7 +52,6 @@ INCLUDE(FindPkgConfig)
 
 SET(PKG_MODULES
        dlog
-       dbus-glib-1
        gobject-2.0
        gmodule-2.0
        vconf
@@ -60,7 +59,6 @@ SET(PKG_MODULES
        glib-2.0
        gio-2.0
        gio-unix-2.0
-       dbus-1
 )
 
 INCLUDE(FindPkgConfig)
@@ -89,10 +87,6 @@ FIND_PROGRAM(MARSHALTOOL NAMES glib-genmarshal)
 EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --header > ${CMAKE_CURRENT_SOURCE_DIR}/include/marshal.h")
 EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --body > ${CMAKE_CURRENT_SOURCE_DIR}/marshal.c")
 
-FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool)
-EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt ${CMAKE_CURRENT_SOURCE_DIR}/bt-request-service.xml --mode=glib-client --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-request-service.h")
-EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bluetooth_gatt ${CMAKE_CURRENT_SOURCE_DIR}/bt-gatt.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-gatt-glue.h")
-
 ADD_LIBRARY(bluetooth-api SHARED ${SRCS})
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES VERSION ${VERSION})

diff --git a/bt-api/bluetooth-api.pc.in b/bt-api/bluetooth-api.pc.in
index c7210a4..43120cf 100644 (file)
--- a/bt-api/bluetooth-api.pc.in
+++ b/bt-api/bluetooth-api.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@
 Name: bluetooth-api
 Description: SAMSUNG Linux platform Bluetooth framework API
 Version: @VERSION@
-Requires: dlog dbus-glib-1 vconf
+Requires: dlog gio-2.0 vconf
 Libs: -L${libdir} -lbluetooth-api
 Cflags: -I${includedir} -I${includedir}/bt-service

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index db71e3a..b0e457c 100644 (file)
--- a/bt-api/bt-common.c
+++ b/bt-api/bt-common.c
@@ -88,8 +88,6 @@ GDBusConnection *g_bus_get_private_conn(void)
 
 GDBusConnection *_bt_gdbus_init_system_gconn(void)
 {
-       dbus_threads_init_default();
-
        if (system_gconn != NULL)
                return system_gconn;
 

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 6e8f97d..b861402 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -16,7 +16,6 @@
  */
 
 #include <string.h>
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
 #include <vconf.h>
@@ -2867,7 +2866,7 @@ void _bt_register_name_owner_changed(void)
                return;
        }
        owner_sig_id = g_dbus_connection_signal_subscribe(connection_type,
-                               NULL, DBUS_INTERFACE_DBUS,
+                               NULL, BT_EVENT_FREEDESKTOP,
                                BT_NAME_OWNER_CHANGED, NULL, NULL, 0,
                                __bt_name_owner_changed, NULL, NULL);
 }

diff --git a/bt-api/bt-gatt.xml b/bt-api/bt-gatt.xml
deleted file mode 100644 (file)
index a2f7bd9..0000000
--- a/bt-api/bt-gatt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-       <interface name="org.bluez.Watcher">
-
-               <method name="ValueChanged">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-                       <arg type="o" name="objpath"/>
-                       <arg type="ay" name="value"/>
-               </method>
-
-       </interface>
-</node>
-

diff --git a/bt-api/bt-request-sender.c b/bt-api/bt-request-sender.c
index 1d88889..5f1ace5 100644 (file)
--- a/bt-api/bt-request-sender.c
+++ b/bt-api/bt-request-sender.c
@@ -30,9 +30,6 @@
 #include "bt-event-handler.h"
 #include "bluetooth-media-control.h"
 
-/* auto generated header by bt-request-service.xml*/
-#include "bt-request-service.h"
-
 static GSList *sending_requests;
 
 static GDBusProxy *service_gproxy;

diff --git a/bt-api/bt-request-service.xml b/bt-api/bt-request-service.xml
deleted file mode 100644 (file)
index 9d34048..0000000
--- a/bt-api/bt-request-service.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<node name="/org/projectx/bt_service">
-  <interface name="org.projectx.bt">
-    <method name="service_request">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="bt_service_request"/>
-      <!-- INPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="i" name="service_type" direction="in" />
-      <arg type="i" name="service_function" direction="in" />
-      <arg type="i" name="request_type" direction="in" />
-      <arg type="ay" name="input_param1" direction="in" />
-      <arg type="ay" name="input_param2" direction="in" />
-      <arg type="ay" name="input_param3" direction="in" />
-      <arg type="ay" name="input_param4" direction="in" />
-      <arg type="ay" name="input_param5" direction="in" />
-      <!-- OUTPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="ay" name="output_param1" direction="out" />
-      <arg type="ay" name="output_param2" direction="out" />
-    </method>
-  </interface>
-</node>
-

diff --git a/bt-api/bt-scmst.c b/bt-api/bt-scmst.c
index dcfc326..a8a56c8 100755 (executable)
--- a/bt-api/bt-scmst.c
+++ b/bt-api/bt-scmst.c
@@ -16,7 +16,6 @@
  */
 
 #include <glib.h>
-#include <dbus/dbus.h>
 
 #include "bt-common.h"
 #include "bt-internal-types.h"

diff --git a/bt-api/bt-service-api.pc.in b/bt-api/bt-service-api.pc.in
index d0d81d4..a008473 100644 (file)
--- a/bt-api/bt-service-api.pc.in
+++ b/bt-api/bt-service-api.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@
 Name: bt-service
 Description: TIZEN Linux platform Bluetooth Service API
 Version: @VERSION@
-Requires: dlog dbus-glib-1 vconf
+Requires: dlog gio-2.0 vconf
 Libs: -L${libdir} -lbt-service-api
 Cflags: -I${includedir} -I${includedir}/bt-service

diff --git a/bt-api/bt-telephony.c b/bt-api/bt-telephony.c
index 2f550d6..493e339 100644 (file)
--- a/bt-api/bt-telephony.c
+++ b/bt-api/bt-telephony.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <dbus/dbus.h>
 #include <unistd.h>
 #include <vconf.h>
 #include <vconf-keys.h>
@@ -1359,8 +1358,8 @@ BT_EXPORT_API int bluetooth_telephony_init(bt_telephony_func_ptr cb,
        telephony_dbus_info.dbus_proxy = g_dbus_proxy_new_sync(
                        telephony_dbus_info.conn,
                        G_DBUS_PROXY_FLAGS_NONE, NULL,
-                       DBUS_SERVICE_DBUS, DBUS_PATH_DBUS,
-                       DBUS_INTERFACE_DBUS, NULL, &error);
+                       BT_EVENT_FREEDESKTOP, BT_FREEDESKTOP_PATH,
+                       BT_EVENT_FREEDESKTOP, NULL, &error);
        if (NULL == telephony_dbus_info.dbus_proxy) {
                __bluetooth_telephony_proxy_deinit();
                telephony_dbus_info.conn = NULL;

diff --git a/bt-api/include/bt-common.h b/bt-api/include/bt-common.h
index fa25e40..b863d34 100644 (file)
--- a/bt-api/include/bt-common.h
+++ b/bt-api/include/bt-common.h
@@ -21,8 +21,6 @@
 
 #include <sys/types.h>
 #include <libintl.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include <dlog.h>
 #include <glib.h>
 #include <gio/gio.h>
@@ -338,9 +336,9 @@ GDBusConnection *_bt_init_system_gdbus_conn(void);
 
 GDBusConnection *g_bus_get_private_conn(void);
 
-DBusGConnection *_bt_get_system_gconn(void);
+//GDBusConnection *_bt_get_system_gconn(void);
 
-DBusConnection *_bt_get_system_conn(void);
+//GDBusConnection *_bt_get_system_conn(void);
 
 int _bt_register_osp_server_in_agent(int type, char *uuid, char *path, int fd);
 int _bt_unregister_osp_server_in_agent(int type, char *uuid);

diff --git a/bt-api/include/bt-event-handler.h b/bt-api/include/bt-event-handler.h
index 72c178f..541c284 100644 (file)
--- a/bt-api/include/bt-event-handler.h
+++ b/bt-api/include/bt-event-handler.h
@@ -19,7 +19,6 @@
 #define _BT_EVENT_HANDLER_H_
 
 #include <sys/types.h>
-#include <dbus/dbus.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/bt-api/include/bt-request-sender.h b/bt-api/include/bt-request-sender.h
index 9c40c3b..88ffaf6 100644 (file)
--- a/bt-api/include/bt-request-sender.h
+++ b/bt-api/include/bt-request-sender.h
@@ -27,13 +27,10 @@ extern "C" {
 
 typedef struct {
        int service_function;
-       GDBusProxy *proxy;
        void *cb;
        void *user_data;
 } bt_req_info_t;
 
-void _bt_gdbus_deinit_proxys(void);
-
 int _bt_sync_send_request(int service_type, int service_function,
                        GArray *in_param1, GArray *in_param2,
                        GArray *in_param3, GArray *in_param4,

diff --git a/bt-core/CMakeLists.txt b/bt-core/CMakeLists.txt
index 05c2dee..25c98a5 100644 (file)
--- a/bt-core/CMakeLists.txt
+++ b/bt-core/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED dbus-1 dbus-glib-1 dlog vconf gio-2.0 gio-unix-2.0 eventsystem)
+pkg_check_modules(pkgs REQUIRED dlog vconf gio-2.0 gio-unix-2.0 eventsystem)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/bt-core/bt-core-adapter.xml b/bt-core/bt-core-adapter.xml
deleted file mode 100644 (file)
index 82682cf..0000000
--- a/bt-core/bt-core-adapter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-       <interface name="org.projectx.btcore">
-               <method name="EnableAdapter">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="DisableAdapter">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="RecoverAdapter">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="ResetAdapter">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="EnableAdapterLe">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="DisableAdapterLe">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-               <method name="EnableCore">
-                       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               </method>
-       </interface>
-</node>

diff --git a/bt-core/bt-request-service.xml b/bt-core/bt-request-service.xml
deleted file mode 100644 (file)
index 9d34048..0000000
--- a/bt-core/bt-request-service.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<node name="/org/projectx/bt_service">
-  <interface name="org.projectx.bt">
-    <method name="service_request">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="bt_service_request"/>
-      <!-- INPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="i" name="service_type" direction="in" />
-      <arg type="i" name="service_function" direction="in" />
-      <arg type="i" name="request_type" direction="in" />
-      <arg type="ay" name="input_param1" direction="in" />
-      <arg type="ay" name="input_param2" direction="in" />
-      <arg type="ay" name="input_param3" direction="in" />
-      <arg type="ay" name="input_param4" direction="in" />
-      <arg type="ay" name="input_param5" direction="in" />
-      <!-- OUTPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="ay" name="output_param1" direction="out" />
-      <arg type="ay" name="output_param2" direction="out" />
-    </method>
-  </interface>
-</node>
-

diff --git a/bt-core/include/bt-core-dbus-handler.h b/bt-core/include/bt-core-dbus-handler.h
index bc21d76..dfaef71 100755 (executable)
--- a/bt-core/include/bt-core-dbus-handler.h
+++ b/bt-core/include/bt-core-dbus-handler.h
@@ -22,9 +22,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <dlog.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
 #include <gio/gio.h>
 

diff --git a/bt-httpproxy/CMakeLists.txt b/bt-httpproxy/CMakeLists.txt
index 77b0f5c..baf570a 100644 (file)
--- a/bt-httpproxy/CMakeLists.txt
+++ b/bt-httpproxy/CMakeLists.txt
@@ -12,12 +12,10 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 SET(PKG_MODULES
-       dbus-glib-1
        gio-2.0
        pkgmgr
        eventsystem
        libsoup-2.4
-       dbus-1
 )
 
 INCLUDE(FindPkgConfig)
@@ -32,8 +30,6 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 SET(APP_SYSCONFDIR /opt/var/lib/bluetooth)
 
-FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool)
-
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_HPS")

diff --git a/bt-service-emul/CMakeLists.txt b/bt-service-emul/CMakeLists.txt
index 039754c..e4f7299 100644 (file)
--- a/bt-service-emul/CMakeLists.txt
+++ b/bt-service-emul/CMakeLists.txt
@@ -37,8 +37,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 SET(PKG_MODULES
        vconf
        aul
-       dbus-glib-1
-       dbus-1
        gio-2.0
        alarm-service
        cynara-client

diff --git a/bt-service-emul/bt-service-common.c b/bt-service-emul/bt-service-common.c
index 2b31b22..36a916b 100644 (file)
--- a/bt-service-emul/bt-service-common.c
+++ b/bt-service-emul/bt-service-common.c
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <termios.h>
-#include <dbus/dbus.h>
 #include <bundle.h>
 #include <glib.h>
 #include <dlog.h>
@@ -42,8 +41,6 @@ GDBusConnection *_bt_gdbus_init_system_gconn(void)
 {
        GError *error = NULL;
 
-       dbus_threads_init_default();
-
        if (system_gconn != NULL)
                return system_gconn;
 

diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt
index 27e556c..6c305ae 100644 (file)
--- a/bt-service/CMakeLists.txt
+++ b/bt-service/CMakeLists.txt
@@ -56,8 +56,6 @@ SET(PKG_MODULES
        aul
        vconf
        syspopup-caller
-       dbus-glib-1
-       dbus-1
        gio-2.0
        alarm-service
        capi-content-mime-type
@@ -98,14 +96,6 @@ FIND_PROGRAM(MARSHALTOOL NAMES glib-genmarshal)
 EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --header > ${CMAKE_CURRENT_SOURCE_DIR}/include/marshal.h")
 EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --body > ${CMAKE_CURRENT_SOURCE_DIR}/marshal.c")
 
-FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool)
-#EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt ${CMAKE_CURRENT_SOURCE_DIR}/bt-request-service.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-service-method.h")
-#EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt_obex_agent ${CMAKE_CURRENT_SOURCE_DIR}/bt-service-obex-agent.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-obex-agent-method.h")
-
-#EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=gap_agent ${CMAKE_CURRENT_SOURCE_DIR}/bt-service-gap-agent1.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-gap-agent-method.h")
-
-#EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt_media_agent ${CMAKE_CURRENT_SOURCE_DIR}/bt-service-media-agent.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-media-agent-method.h")
-
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DVENDOR=\"${APP_VENDOR}\"")
 ADD_DEFINITIONS("-DAPPNAME=\"${APP_NAME}\"")

diff --git a/bt-service/bt-request-service.xml b/bt-service/bt-request-service.xml
deleted file mode 100644 (file)
index 9d34048..0000000
--- a/bt-service/bt-request-service.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<node name="/org/projectx/bt_service">
-  <interface name="org.projectx.bt">
-    <method name="service_request">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="bt_service_request"/>
-      <!-- INPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="i" name="service_type" direction="in" />
-      <arg type="i" name="service_function" direction="in" />
-      <arg type="i" name="request_type" direction="in" />
-      <arg type="ay" name="input_param1" direction="in" />
-      <arg type="ay" name="input_param2" direction="in" />
-      <arg type="ay" name="input_param3" direction="in" />
-      <arg type="ay" name="input_param4" direction="in" />
-      <arg type="ay" name="input_param5" direction="in" />
-      <!-- OUTPUT PARAMS FOR SERVICE FUNCTION  -->
-      <arg type="ay" name="output_param1" direction="out" />
-      <arg type="ay" name="output_param2" direction="out" />
-    </method>
-  </interface>
-</node>
-

diff --git a/bt-service/bt-service-adapter-le.c b/bt-service/bt-service-adapter-le.c
index b97ddfb..b27d208 100644 (file)
--- a/bt-service/bt-service-adapter-le.c
+++ b/bt-service/bt-service-adapter-le.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdio.h>
-#include <dbus/dbus.h>
 #include <gio/gio.h>
 #include <glib.h>
 #include <dlog.h>

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index 25b86e6..33bc5d0 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -23,8 +23,6 @@
 #include <vconf.h>
 #include <syspopup_caller.h>
 #include <aul.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include <bundle.h>
 #include <eventsystem.h>
 #include <bundle_internal.h>

diff --git a/bt-service/bt-service-avrcp.c b/bt-service/bt-service-avrcp.c
index cd6c898..89321ee 100644 (file)
--- a/bt-service/bt-service-avrcp.c
+++ b/bt-service/bt-service-avrcp.c
@@ -20,7 +20,6 @@
 #include <dlog.h>
 #include <string.h>
 #include <syspopup_caller.h>
-#include <dbus/dbus.h>
 
 #include "bluetooth-api.h"
 #include "bt-internal-types.h"
@@ -81,7 +80,7 @@ static gboolean __bt_media_emit_property_changed(GDBusConnection *connection,
        g_variant_builder_add(builder, "{sv}", name, variant);
 
        g_dbus_connection_emit_signal(connection, NULL, path,
-                               DBUS_INTERFACE_PROPERTIES,
+                               BT_PROPERTIES_INTERFACE,
                                "PropertiesChanged",
                                g_variant_new("(sa{sv})",
                                interface, builder),
@@ -475,7 +474,7 @@ int _bt_avrcp_set_track_info(media_metadata_attributes_t *meta_data)
                "Metadata", g_variant_new("a{sv}", inner_builder));
 
        ret = g_dbus_connection_emit_signal(g_conn, NULL, BT_MEDIA_OBJECT_PATH,
-                               DBUS_INTERFACE_PROPERTIES,
+                               BT_PROPERTIES_INTERFACE,
                                "PropertiesChanged",
                                g_variant_new("(sa{sv})",
                                interface, builder),

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index d17c6af..d02e90c 100644 (file)
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <termios.h>
 #include <net_connection.h>
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
 #include <fcntl.h>
@@ -49,8 +48,6 @@ GDBusConnection *_bt_gdbus_init_system_gconn(void)
 {
        GError *error = NULL;
 
-       dbus_threads_init_default();
-
        if (system_conn != NULL)
                return system_conn;
 
@@ -89,8 +86,6 @@ GDBusConnection *_bt_gdbus_init_session_gconn(void)
 {
        GError *error = NULL;
 
-       dbus_threads_init_default();
-
        if (session_conn != NULL)
                return session_conn;
 
@@ -130,8 +125,6 @@ static GDBusProxy *__bt_init_manager_proxy(void)
        GDBusConnection *g_conn;
        GDBusProxy *proxy;
 
-       dbus_threads_init_default();
-
        g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, NULL);
 
@@ -156,8 +149,6 @@ static GDBusProxy *__bt_init_adapter_proxy(void)
        GDBusProxy *proxy;
        char *adapter_path = NULL;
 
-       dbus_threads_init_default();
-
        g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, NULL);
 
@@ -187,8 +178,6 @@ static GDBusProxy *__bt_init_adapter_properties_proxy(void)
        GDBusProxy *proxy;
        char *adapter_path = NULL;
 
-       dbus_threads_init_default();
-
        g_conn = _bt_gdbus_get_system_gconn();
        retv_if(g_conn == NULL, NULL);
 

diff --git a/bt-service/bt-service-gap-agent1.xml b/bt-service/bt-service-gap-agent1.xml
deleted file mode 100644 (file)
index 477b018..0000000
--- a/bt-service/bt-service-gap-agent1.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-  <interface name="org.bluez.Agent1">
-    <method name="RequestPinCode">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-      <arg type="s" name="pincode" direction="out"/>
-    </method>
-
-    <method name="RequestPasskey">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-      <arg type="u" name="passkey" direction="out"/>
-    </method>
-
-    <method name="DisplayPasskey">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-      <arg type="u" name="passkey"/>
-      <arg type="q" name="entered"/>
-    </method>
-
-    <method name="RequestConfirmation">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-      <arg type="u" name="passkey"/>
-    </method>
-
-    <method name="RequestAuthorization">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-    </method>
-
-   <method name="AuthorizeService">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
-      <arg type="s" name="uuid"/>
-    </method>
-
-   <method name="Cancel">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="Release">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="ReplyPinCode">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="u" name="accept"/>
-      <arg type="s" name="pincode"/>
-    </method>
-
-    <method name="ReplyPasskey">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="u" name="accept"/>
-      <arg type="s" name="passkey"/>
-    </method>
-
-    <method name="ReplyConfirmation">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="u" name="accept"/>
-    </method>
-
-    <method name="ReplyAuthorize">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="u" name="accept"/>
-    </method>
-
-    <method name="ConfirmModeChange">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="s" name="mode"/>
-    </method>
-
-    <method name="GetDiscoverableTimeout">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="u" name="timeout" direction="out"/>
-    </method>
-  </interface>
-</node>

diff --git a/bt-service/bt-service-media-agent.xml b/bt-service/bt-service-media-agent.xml
deleted file mode 100644 (file)
index d7c2afe..0000000
--- a/bt-service/bt-service-media-agent.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-  <interface name="org.bluez.MediaPlayer">
-    <method name="SetProperty">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="s" name="property"/>
-      <arg type="v" name="value"/>
-    </method>
-  </interface>
-  <interface name="org.freedesktop.DBus.Properties">
-    <method name="Set">
-      <arg type="s" name="property"/>
-      <arg type="v" name="value"/>
-    </method>
-  </interface>
-</node>

diff --git a/bt-service/bt-service-obex-agent.xml b/bt-service/bt-service-obex-agent.xml
deleted file mode 100644 (file)
index 6971a31..0000000
--- a/bt-service/bt-service-obex-agent.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-  <interface name="org.openobex.Agent">
-    <method name="Request">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="transfer"/>
-      <arg type="s" name="name" direction="out"/>
-    </method>
-
-    <method name="Progress">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="transfer"/>
-      <arg type="t" name="transferred"/>
-    </method>
-
-    <method name="Complete">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="transfer"/>
-    </method>
-
-    <method name="Release">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="Error">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="transfer"/>
-      <arg type="s" name="message"/>
-    </method>
-    <method name="Authorize">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-               <arg type="o" name="objpath"/>
-               <arg type="s" name="bdaddress"/>
-               <arg type="s" name="name"/>
-               <arg type="s" name="type"/>
-               <arg type="i" name="length"/>
-               <arg type="i" name="time"/>
-               <arg type="s" name="filepath" direction="out"/>
-       </method>
-  </interface>
-  <interface name="org.bluez.obex.Agent1">
-    <method name="AuthorizePush">
-    <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-        <arg type="o" name="objpath"/>
-        <arg type="s" name="filepath" direction="out"/>
-    </method>
-  </interface>
-</node>

diff --git a/bt-service/bt-service-rfcomm-client.c b/bt-service/bt-service-rfcomm-client.c
index 9f07281..78e96d1 100755 (executable)
--- a/bt-service/bt-service-rfcomm-client.c
+++ b/bt-service/bt-service-rfcomm-client.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
 #include <string.h>

diff --git a/bt-service/bt-service-rfcomm-server.c b/bt-service/bt-service-rfcomm-server.c
index ad82518..dd967bc 100755 (executable)
--- a/bt-service/bt-service-rfcomm-server.c
+++ b/bt-service/bt-service-rfcomm-server.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
 #include <string.h>

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index eeefd37..c3f9924 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -11,13 +11,11 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001: bluetooth-frwk.manifest
 
-Requires: dbus
 Requires: syspopup
 %if "%{?profile}" != "mobile"
 Requires: bluetooth-tools
 %endif
 BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -25,7 +23,6 @@ BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(syspopup-caller)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(capi-network-connection)
 BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(capi-content-mime-type)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b1b2e87..cc4ad7d 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(package REQUIRED dlog dbus-1 glib-2.0 gthread-2.0 gobject-2.0)
+pkg_check_modules(package REQUIRED dlog gio-2.0 glib-2.0 gthread-2.0 gobject-2.0)
 
 FOREACH(flag ${package_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/test/bluetooth-frwk-test.c b/test/bluetooth-frwk-test.c
index 7cdc870..c653d71 100644 (file)
--- a/test/bluetooth-frwk-test.c
+++ b/test/bluetooth-frwk-test.c
@@ -23,9 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
 #include <pthread.h>
-#include <dbus/dbus.h>
 #include <stdint.h>
 
 #include "bluetooth-api.h"
@@ -1251,8 +1250,6 @@ void startup()
 {
        TC_PRT("bluetooth framework TC startup");
 
-       dbus_threads_init_default();
-
        main_loop = g_main_loop_new(NULL, FALSE);
 }
 

diff --git a/test/gatt-test/CMakeLists.txt b/test/gatt-test/CMakeLists.txt
index 4b6eff6..183f207 100644 (file)
--- a/test/gatt-test/CMakeLists.txt
+++ b/test/gatt-test/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(package REQUIRED dlog dbus-1 glib-2.0 gthread-2.0 gobject-2.0)
+pkg_check_modules(package REQUIRED dlog gio-2.0 glib-2.0 gthread-2.0 gobject-2.0)
 
 FOREACH(flag ${package_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/test/gatt-test/bluetooth-gatt-test.c b/test/gatt-test/bluetooth-gatt-test.c
index 2719594..6b179d5 100644 (file)
--- a/test/gatt-test/bluetooth-gatt-test.c
+++ b/test/gatt-test/bluetooth-gatt-test.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
+#include <gio/gio.h>
+
 #include "bluetooth-api.h"
 
 
@@ -218,8 +218,6 @@ void startup()
 {
        TC_PRT("bluetooth framework TC startup");
 
-       dbus_threads_init_default();
-
        main_loop = g_main_loop_new(NULL, FALSE);
 }
 

diff --git a/test/le-adv/CMakeLists.txt b/test/le-adv/CMakeLists.txt
index d55ce1d..0ae77cc 100644 (file)
--- a/test/le-adv/CMakeLists.txt
+++ b/test/le-adv/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(package REQUIRED dlog dbus-1 glib-2.0 gthread-2.0 gobject-2.0)
+pkg_check_modules(package REQUIRED dlog gio-2.0 glib-2.0 gthread-2.0 gobject-2.0)
 
 FOREACH(flag ${package_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/test/le-adv/bluetooth-advertising-test.c b/test/le-adv/bluetooth-advertising-test.c
index 9e005de..64fb779 100755 (executable)
--- a/test/le-adv/bluetooth-advertising-test.c
+++ b/test/le-adv/bluetooth-advertising-test.c
@@ -28,8 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
+#include <gio/gio.h>
 
 #include "bluetooth-api.h"
 
@@ -234,8 +233,6 @@ void startup()
 {
        TC_PRT("bluetooth framework TC startup");
 
-       dbus_threads_init_default();
-
        main_loop = g_main_loop_new(NULL, FALSE);
 }