From 939cebb9f363dc8e7048b05273bdaa87d111c46b Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 20 Dec 2012 20:38:16 +0200
Subject: [PATCH] obex-client: Rename org.bluez.obex.Synchronization to
 Synchronization1

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

diff --git a/doc/obex-client-api.txt b/doc/obex-client-api.txt
index b73d0d0c1..dc92d6500 100644
--- a/doc/obex-client-api.txt
+++ b/doc/obex-client-api.txt
@@ -4,52 +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.
 
-Synchronization hierarchy
-=======================
-
-Service		org.bluez.obex
-Interface	org.bluez.obex.Synchronization
-Object path	[variable prefix]/{session0,session1,...}
-
-Methods		void SetLocation(string location)
-
-			Set the phonebook object store location for other
-			operations. Should be called before all the other
-			operations.
-
-			location: Where the phonebook is stored, possible
-			values:
-				"INT" ( "INTERNAL" which is default )
-				"SIM1"
-				"SIM2"
-				......
-
-		object, dict GetPhonebook(string targetfile)
-
-			Retrieve an entire Phonebook Object store from remote
-			device, and stores it in a local file.
-
-			If an empty target file is given, a name will be
-			automatically calculated for the temporary file.
-
-			The returned path represents the newly created transfer,
-			which should be used to find out if the content has been
-			successfully transferred or if the operation fails.
-
-			The properties of this transfer are also returned along
-			with the object path, to avoid a call to GetProperties.
-
-		object, dict PutPhonebook(string sourcefile)
-
-			Send an entire Phonebook Object store to remote device.
-
-			The returned path represents the newly created transfer,
-			which should be used to find out if the content has been
-			successfully transferred or if the operation fails.
-
-			The properties of this transfer are also returned along
-			with the object path, to avoid a call to GetProperties.
-
 Message Access hierarchy
 =========================
 
diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index c70a7cde9..1b4c250d8 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
@@ -377,3 +377,49 @@ Filter:		string Format:
 			Item vcard fields, default is all values.
 
 			Possible values can be query with ListFilterFields.
+
+Synchronization hierarchy
+=======================
+
+Service		org.bluez.obex
+Interface	org.bluez.obex.Synchronization1
+Object path	/org/bluez/obex/session{0, 1, 2, ...}
+
+Methods		void SetLocation(string location)
+
+			Set the phonebook object store location for other
+			operations. Should be called before all the other
+			operations.
+
+			location: Where the phonebook is stored, possible
+			values:
+				"INT" ( "INTERNAL" which is default )
+				"SIM1"
+				"SIM2"
+				......
+
+		object, dict GetPhonebook(string targetfile)
+
+			Retrieve an entire Phonebook Object store from remote
+			device, and stores it in a local file.
+
+			If an empty target file is given, a name will be
+			automatically calculated for the temporary file.
+
+			The returned path represents the newly created transfer,
+			which should be used to find out if the content has been
+			successfully transferred or if the operation fails.
+
+			The properties of this transfer are also returned along
+			with the object path, to avoid a call to GetProperties.
+
+		object, dict PutPhonebook(string sourcefile)
+
+			Send an entire Phonebook Object store to remote device.
+
+			The returned path represents the newly created transfer,
+			which should be used to find out if the content has been
+			successfully transferred or if the operation fails.
+
+			The properties of this transfer are also returned along
+			with the object path, to avoid a call to GetProperties.
diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index d70706aaf..1c9a5f964 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -42,7 +42,7 @@
 #define OBEX_SYNC_UUID "IRMC-SYNC"
 #define OBEX_SYNC_UUID_LEN 9
 
-#define SYNC_INTERFACE "org.bluez.obex.Synchronization"
+#define SYNC_INTERFACE "org.bluez.obex.Synchronization1"
 #define ERROR_INF SYNC_INTERFACE ".Error"
 #define SYNC_UUID "00001104-0000-1000-8000-00805f9b34fb"
 
-- 
2.47.3