add data parameter to bt_pairing_agent_on()

It allows to forward pairing data to plugin

Change-Id: I89ef12f1cd27aec3e253f43946e4ec7746964f01
Signed-off-by: Corentin Lecouvey <corentin.lecouvey@open.eurogiciel.org>

diff --git a/include/vertical.h b/include/vertical.h
index 7f9b005..976d23e 100644 (file)
--- a/include/vertical.h
+++ b/include/vertical.h
@@ -27,11 +27,7 @@ struct bluetooth_vertical_driver {
        int (*disabled)(void);
        int (*transfer)(double);
        int (*opp_agent_on)(void);
-#ifdef TIZEN_3
        int (*pairing_agent_on)(void*);
-#else
-       int (*pairing_agent_on)(void);
-#endif
 };
 
 void comms_service_register_bt_vertical_driver(
@@ -45,11 +41,8 @@ int vertical_notify_bt_enabled(void);
 void vertical_notify_bt_disabled(void);
 
 void vertical_notify_bt_transfer(double progress);
-#ifdef TIZEN_3
+
 void vertical_notify_bt_pairing_agent_on(void* data);
-#else
-void vertical_notify_bt_pairing_agent_on(void);
-#endif
 
 void vertical_notify_bt_opp_agent_on(void);
 #endif

diff --git a/plugins/bluetooth-geek.c b/plugins/bluetooth-geek.c
index c231f57..7084069 100644 (file)
--- a/plugins/bluetooth-geek.c
+++ b/plugins/bluetooth-geek.c
@@ -130,7 +130,7 @@ static int bt_transfer(double progress)
        return 0;
 }
 
-static int bt_pairing_agent_on(void)
+static int bt_pairing_agent_on(void *data)
 {
        /*TODO:
         * In Geek, it should startup Application that using

diff --git a/plugins/bluetooth-mobile.c b/plugins/bluetooth-mobile.c
index 23b02bf..692592b 100644 (file)
--- a/plugins/bluetooth-mobile.c
+++ b/plugins/bluetooth-mobile.c
@@ -276,7 +276,7 @@ static int bt_transfer(double progress)
        return 0;
 }
 
-static int bt_pairing_agent_on(void)
+static int bt_pairing_agent_on(void *data)
 {
        bundle *b;
        int ret;

diff --git a/src/pairing.c b/src/pairing.c
index cd13c10..7bd0712 100644 (file)
--- a/src/pairing.c
+++ b/src/pairing.c
@@ -675,7 +675,7 @@ static void handle_pairing_agent_method_call(GDBusConnection *connection,
        }
 
 #ifndef TIZEN_3
-       vertical_notify_bt_pairing_agent_on();
+       vertical_notify_bt_pairing_agent_on(NULL);
 
        relay_agent_timeout_id = g_timeout_add(5000,
                                        relay_agent_timeout_cb, NULL);

diff --git a/src/vertical.c b/src/vertical.c
index 05b08d7..1661744 100644 (file)
--- a/src/vertical.c
+++ b/src/vertical.c
@@ -83,7 +83,6 @@ void vertical_notify_bt_disabled(void)
                bluetooth_driver->disabled();
 }
 
-#ifdef TIZEN_3
 void vertical_notify_bt_pairing_agent_on(void *data)
 {
        if (!bluetooth_driver)
@@ -92,16 +91,7 @@ void vertical_notify_bt_pairing_agent_on(void *data)
        if (bluetooth_driver->pairing_agent_on)
                bluetooth_driver->pairing_agent_on(data);
 }
-#else
-void vertical_notify_bt_pairing_agent_on(void)
-{
-       if (!bluetooth_driver)
-               return;
 
-       if (bluetooth_driver->pairing_agent_on)
-               bluetooth_driver->pairing_agent_on();
-}
-#endif
 void vertical_notify_bt_opp_agent_on(void)
 {
        if (!bluetooth_driver)