From 35990b8bdd577081a581f1ae865bccc439cc5311 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 20 Dec 2012 20:01:10 +0200
Subject: [PATCH] obexd: Rename org.bluez.obex.Client to org.bluez.obex.Client1

Rename the interface and move it to obexd-api.txt since it now belongs
to the same daemon.
---
 doc/obex-client-api.txt | 32 --------------------------------
 doc/obexd-api.txt       | 31 +++++++++++++++++++++++++++++++
 obexd/client/manager.c  |  2 +-
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/doc/obex-client-api.txt b/doc/obex-client-api.txt
index b44cb2882..7c8de162e 100644
--- a/doc/obex-client-api.txt
+++ b/doc/obex-client-api.txt
@@ -4,38 +4,6 @@ OBEX client API description
 Copyright (C) 2007-2010  Marcel Holtmann <marcel@holtmann.org>
 Copyright (C) 2011-2012  BMW Car IT GmbH. All rights reserved.
 
-
-Client hierarchy
-================
-
-Service		org.bluez.obex
-Interface	org.bluez.obex.Client
-Object path	/org/bluez/obex
-
-Methods		object CreateSession(string destination, dict args)
-
-			Create a new OBEX session for the given remote address.
-
-			The last parameter is a dictionary to hold optional or
-			type-specific parameters. Typical parameters that can
-			be set in this dictionary include the following:
-
-				string "Target" : type of session to be created
-				string "Source" : local address to be used
-				byte "Channel"
-
-			The currently supported targets are the following:
-
-				"FTP"
-				"MAP"
-				"OPP"
-				"PBAP"
-				"SYNC"
-
-		void RemoveSession(object session)
-
-			Unregister session and abort pending transfers.
-
 Session hierarchy
 =================
 
diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index 24af2337a..3b77e74eb 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
@@ -28,6 +28,37 @@ Methods		void RegisterAgent(object agent)
 
 			Possible errors: org.bluez.obex.Error.DoesNotExist
 
+Manager hierarchy
+================
+
+Service		org.bluez.obex
+Interface	org.bluez.obex.Client1
+Object path	/org/bluez/obex
+
+Methods		object CreateSession(string destination, dict args)
+
+			Create a new OBEX session for the given remote address.
+
+			The last parameter is a dictionary to hold optional or
+			type-specific parameters. Typical parameters that can
+			be set in this dictionary include the following:
+
+				string "Target" : type of session to be created
+				string "Source" : local address to be used
+				byte "Channel"
+
+			The currently supported targets are the following:
+
+				"FTP"
+				"MAP"
+				"OPP"
+				"PBAP"
+				"SYNC"
+
+		void RemoveSession(object session)
+
+			Unregister session and abort pending transfers.
+
 Transfer hierarchy
 ===============
 
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 947068d47..8f62a30e8 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -46,7 +46,7 @@
 #include "map.h"
 #include "obexd/src/manager.h"
 
-#define CLIENT_INTERFACE	"org.bluez.obex.Client"
+#define CLIENT_INTERFACE	"org.bluez.obex.Client1"
 #define ERROR_INTERFACE		"org.bluez.obex.Error"
 #define CLIENT_PATH		"/org/bluez/obex"
 
-- 
2.47.3