From 9d5936a515f870968425c346f353d6c70685781b Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Mon, 28 Mar 2011 19:16:19 +0300
Subject: [PATCH] Clean up Out Of Band D-Bus interface naming

---
 doc/oob-api.txt   | 8 ++++----
 plugins/dbusoob.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/oob-api.txt b/doc/oob-api.txt
index 8f6aac91c..d8387123d 100644
--- a/doc/oob-api.txt
+++ b/doc/oob-api.txt
@@ -4,10 +4,10 @@ BlueZ D-Bus Out Of Band Pairing API description
 Copyright (C) 2011  Szymon Janc <szymon.janc@tieto.com> for ST-Ericsson
 
 Service		org.bluez
-Interface	org.bluez.Oob
+Interface	org.bluez.OutOfBand
 Object path	[variable prefix]/{hci0,hci1,...}
 
-Methods		array{byte} hash, array{byte} randomizer ReadLocalOobData()
+Methods		array{byte} hash, array{byte} randomizer ReadLocalData()
 
 			This method reads local OOB data from adapter. Return
 			value is pair of arrays 16 bytes each.
@@ -18,7 +18,7 @@ Methods		array{byte} hash, array{byte} randomizer ReadLocalOobData()
 			Possible errors: org.bluez.Error.Failed
 					 org.bluez.Error.InProgress
 
-		void AddRemoteOobData(string address, array{byte} hash,
+		void AddRemoteData(string address, array{byte} hash,
 							array{byte} randomizer)
 
 			This method adds new Out Of Band data for
@@ -28,7 +28,7 @@ Methods		array{byte} hash, array{byte} randomizer ReadLocalOobData()
 			Possible errors: org.bluez.Error.Failed
 					 org.bluez.Error.InvalidArguments
 
-		void RemoveRemoteOobData(string address)
+		void RemoveRemoteData(string address)
 
 			This method removes Out Of Band data for specified
 			address. If data for specified address does not exist
diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 206c4b7ba..8a678bb97 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -45,7 +45,7 @@
 #include "oob.h"
 
 #define REQUEST_TIMEOUT	(60 * 1000)	/* 60 seconds */
-#define OOB_INTERFACE	"org.bluez.Oob"
+#define OOB_INTERFACE	"org.bluez.OutOfBand"
 
 struct oob_request {
 	struct btd_adapter *adapter;
@@ -177,9 +177,9 @@ static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg,
 }
 
 static GDBusMethodTable oob_methods[] = {
-	{"AddRemoteOobData",	"sayay",	"",	add_remote_data},
-	{"RemoveRemoteOobData",	"s",		"",	remove_remote_data},
-	{"ReadLocalOobData",	"",		"ayay",	read_local_data,
+	{"AddRemoteData",	"sayay",	"",	add_remote_data},
+	{"RemoveRemoteData",	"s",		"",	remove_remote_data},
+	{"ReadLocalData",	"",		"ayay",	read_local_data,
 						G_DBUS_METHOD_FLAG_ASYNC},
 	{}
 };
-- 
2.47.3