Index: input/device.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/device.c,v
retrieving revision 1.37
diff -u -p -r1.37 device.c
--- input/device.c	22 Mar 2007 14:53:22 -0000	1.37
+++ input/device.c	27 Mar 2007 16:40:09 -0000
@@ -889,7 +889,28 @@ static DBusHandlerResult device_is_conne
 	return send_message_and_unref(conn, reply);
 }
 
-static DBusHandlerResult device_get_address(DBusConnection *conn,
+static DBusHandlerResult device_get_local_address(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	struct device *idev = data;
+	DBusMessage *reply;
+	char addr[18];
+	const char *paddr = addr;
+
+	ba2str(&idev->src, addr);
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+	dbus_message_append_args(reply,
+			DBUS_TYPE_STRING, &paddr,
+			DBUS_TYPE_INVALID);
+
+	return send_message_and_unref(conn, reply);
+}
+
+static DBusHandlerResult device_get_peer_address(DBusConnection *conn,
 						DBusMessage *msg, void *data)
 {
 	struct device *idev = data;
@@ -983,8 +1004,11 @@ static DBusHandlerResult device_message(
 	if (strcmp(member, "IsConnected") == 0)
 		return device_is_connected(conn, msg, data);
 
-	if (strcmp(member, "GetAddress") == 0)
-		return device_get_address(conn, msg, data);
+	if (strcmp(member, "GetLocalAddress") == 0)
+		return device_get_local_address(conn, msg, data);
+
+	if (strcmp(member, "GetPeerAddress") == 0)
+		return device_get_peer_address(conn, msg, data);
 
 	if (strcmp(member, "GetName") == 0)
 		return device_get_name(conn, msg, data);
Index: input/input-api.txt
===================================================================
RCS file: /cvsroot/bluez/utils/input/input-api.txt,v
retrieving revision 1.8
diff -u -p -r1.8 input-api.txt
--- input/input-api.txt	22 Mar 2007 14:55:35 -0000	1.8
+++ input/input-api.txt	27 Mar 2007 16:40:09 -0000
@@ -48,7 +48,13 @@ Service		org.bluez.input
 Interface	org.bluez.input.Device
 Object path	/org/bluez/input/{keyboard*|mouse*|...}
 
-Methods		string GetAddress()
+Methods		string GetLocalAddress()
+
+			Returns the adapter address.
+
+			Example: "00:11:22:33:44:55"
+
+		string GetPeerAddress()
 
 			Returns the device address.