X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-core%2Fbt-core-dbus-handler.c;h=5eb2894f8442146fefde074220e196a70a5ed898;hb=fe4f8a1ad930daab9e7f8f5250b03ff9deb84f81;hp=b6a0e7718e12ffea19d7d00cb23cbf69f28c100e;hpb=746add44a75b1d26885dea82fe90652bae4de57c;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-core/bt-core-dbus-handler.c b/bt-core/bt-core-dbus-handler.c
index b6a0e77..5eb2894 100755
--- a/bt-core/bt-core-dbus-handler.c
+++ b/bt-core/bt-core-dbus-handler.c
@@ -29,7 +29,7 @@
 #define BT_SERVICE_NAME		"org.projectx.bt"
 #define BT_SERVICE_PATH		"/org/projectx/bt_service"
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 #define BT_HPS_SERVICE_NAME "org.projectx.httpproxy"
 #define BT_HPS_OBJECT_PATH "/org/projectx/httpproxy"
 #define BT_HPS_INTERFACE_NAME "org.projectx.httpproxy_service"
@@ -37,7 +37,7 @@
 
 static GDBusConnection *service_gconn;
 static GDBusProxy *service_gproxy;
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 static GDBusProxy *hps_gproxy;
 #endif
 
@@ -108,12 +108,12 @@ GDBusProxy *_bt_core_gdbus_get_service_proxy(void)
 	return (service_gproxy) ? service_gproxy : __bt_core_gdbus_init_service_proxy();
 }
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 int _bt_core_start_httpproxy(void)
 {
 	GVariant *variant = NULL;
 	unsigned char enabled;
-
+	GError *err = NULL;
 	BT_DBG(" ");
 
 	hps_gproxy = _bt_core_gdbus_get_hps_proxy();
@@ -123,7 +123,11 @@ int _bt_core_start_httpproxy(void)
 	}
 
 	variant = g_dbus_proxy_call_sync(hps_gproxy, "enable",
-				NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+				NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+	if (err) {
+		BT_ERR("Error : %s" , err->message);
+		g_clear_error(&err);
+	}
 	if (variant) {
 		g_variant_get(variant, "(y)", &enabled);
 		BT_ERR("HPS enabled status 0x%x", enabled);
@@ -135,7 +139,7 @@ int _bt_core_stop_httpproxy(void)
 {
 	GVariant *variant = NULL;
 	unsigned char enabled;
-
+	GError *err = NULL;
 	BT_DBG(" ");
 
 	hps_gproxy = _bt_core_gdbus_get_hps_proxy();
@@ -145,7 +149,11 @@ int _bt_core_stop_httpproxy(void)
 	}
 
 	variant = g_dbus_proxy_call_sync(hps_gproxy, "disable",
-				NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+				NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+	if (err) {
+		BT_ERR("Error : %s" , err->message);
+		g_clear_error(&err);
+	}
 	if (variant) {
 		g_variant_get(variant, "(y)", &enabled);
 		BT_ERR("HPS disabled status 0x%x", enabled);
@@ -199,7 +207,7 @@ void _bt_core_gdbus_deinit_proxys(void)
 		service_gproxy = NULL;
 	}
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 	if (hps_gproxy) {
 		g_object_unref(hps_gproxy);
 		hps_gproxy = NULL;
@@ -218,7 +226,7 @@ int _bt_core_service_request(int service_type, int service_function,
 			GArray **out_param1)
 {
 	GDBusProxy  *proxy;
-	GVariant *ret;
+	GVariant *ret = NULL;
 	GVariant *param1;
 	GVariant *param2;
 	GVariant *param3;
@@ -379,6 +387,7 @@ static void __bt_core_dbus_method(GDBusConnection *connection,
 		ret = _bt_core_factory_test_mode(type, arg);
 		g_dbus_method_invocation_return_value(invocation,
 				g_variant_new("(i)", ret));
+		_bt_core_terminate();
 		 return;
 	} else {
 		ret = FALSE;
@@ -534,6 +543,7 @@ gboolean _bt_core_register_dbus(void)
 					node_info->interfaces[0],
 					&method_table,
 					NULL, NULL, &error);
+	g_dbus_node_info_unref(node_info);
 	if (obj_id == 0) {
 		BT_ERR("Failed to register: %s", error->message);
 		g_error_free(error);