Merge the code from tizen_2.4

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-gap-agent.c

diff --git a/bt-service/bt-service-gap-agent.c b/bt-service/bt-service-gap-agent.c
index 0578822..98f2e9c 100644 (file)
--- a/bt-service/bt-service-gap-agent.c
+++ b/bt-service/bt-service-gap-agent.c
@@ -399,7 +399,11 @@ gboolean _gap_agent_register(GapAgentPrivate *agent)
        }
 
        reply = g_dbus_proxy_call_sync(agent_manager, "RegisterAgent",
+#ifdef TIZEN_BT_IO_CAPA_NO_INPUT_OUTPUT
+                       g_variant_new("(os)", priv->path, "NoInputNoOutput"),
+#else
                        g_variant_new("(os)", priv->path, "DisplayYesNo"),
+#endif
                                G_DBUS_CALL_FLAGS_NONE, -1,
                                NULL, &error);
        if (reply == NULL) {
@@ -491,54 +495,54 @@ static gboolean __gap_agent_unregister(GapAgentPrivate *agent)
 static const gchar gap_agent_bluez_introspection_xml[] =
 "<node name='/'>"
 "  <interface name='org.bluez.Agent1'>"
-"    <method name='RequestPinCode'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='s' name='pincode' direction='out'/>"
-"    </method>"
-"    <method name='RequestPasskey'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='u' name='passkey' direction='out'/>"
-"    </method>"
-"    <method name='DisplayPasskey'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='u' name='passkey' direction='in'/>"
-"      <arg type='q' name='entered' direction='in'/>"
-"    </method>"
-"    <method name='RequestConfirmation'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='u' name='passkey' direction='in'/>"
-"    </method>"
-"    <method name='RequestAuthorization'>"
-"      <arg type='o' name='device' direction='in'/>"
-"    </method>"
-"    <method name='AuthorizeService'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='s' name='uuid' direction='in'/>"
-"    </method>"
+"       <method name='GetDiscoverableTimeout'>"
+"         <arg type='u' name='timeout' direction='out'/>"
+"       </method>"
 "    <method name='Cancel'>"
 "    </method>"
+"       <method name='RequestPasskey'>"
+"         <arg type='o' name='device' direction='in'/>"
+"         <arg type='u' name='passkey' direction='out'/>"
+"       </method>"
 "    <method name='Release'>"
 "    </method>"
-"    <method name='ReplyPinCode'>"
-"      <arg type='u' name='accept' direction='in'/>"
-"      <arg type='s' name='pincode' direction='in'/>"
-"    </method>"
+"       <method name='RequestConfirmation'>"
+"         <arg type='o' name='device' direction='in'/>"
+"         <arg type='u' name='passkey' direction='in'/>"
+"       </method>"
+"       <method name='RequestAuthorization'>"
+"         <arg type='o' name='device' direction='in'/>"
+"       </method>"
 "    <method name='ReplyPasskey'>"
 "      <arg type='u' name='accept' direction='in'/>"
 "      <arg type='s' name='passkey' direction='in'/>"
 "    </method>"
+"       <method name='DisplayPasskey'>"
+"         <arg type='o' name='device' direction='in'/>"
+"         <arg type='u' name='passkey' direction='in'/>"
+"         <arg type='q' name='entered' direction='in'/>"
+"       </method>"
 "    <method name='ReplyConfirmation'>"
 "      <arg type='u' name='accept' direction='in'/>"
 "    </method>"
+"       <method name='ReplyPinCode'>"
+"         <arg type='u' name='accept' direction='in'/>"
+"         <arg type='s' name='pincode' direction='in'/>"
+"       </method>"
 "    <method name='ReplyAuthorize'>"
 "      <arg type='u' name='accept' direction='in'/>"
 "    </method>"
+"       <method name='RequestPinCode'>"
+"         <arg type='o' name='device' direction='in'/>"
+"         <arg type='s' name='pincode' direction='out'/>"
+"       </method>"
 "    <method name='ConfirmModeChange'>"
 "      <arg type='s' name='mode' direction='in'/>"
 "    </method>"
-"    <method name='GetDiscoverableTimeout'>"
-"      <arg type='u' name='timeout' direction='out'/>"
-"    </method>"
+"       <method name='AuthorizeService'>"
+"         <arg type='o' name='device' direction='in'/>"
+"         <arg type='s' name='uuid' direction='in'/>"
+"       </method>"
 "  </interface>"
 "</node>";