From ac43647ac01cb990555c7b4ff7b8bf5fb8b17b83 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Fri, 24 May 2013 13:21:32 +0200
Subject: [PATCH] Update adapter interface for BlueZ 5

And move it to a define while at it.

https://bugzilla.gnome.org/show_bug.cgi?id=700915
---
 panels/bluetooth/cc-bluetooth-panel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c
index 978404439..7a45a7fcf 100644
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -43,6 +43,9 @@ CC_PANEL_REGISTER (CcBluetoothPanel, cc_bluetooth_panel)
 
 #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, s))
 
+#define BLUEZ_SERVICE	"org.bluez"
+#define ADAPTER_IFACE	"org.bluez.Adapter1"
+
 #define KEYBOARD_PREFS		"keyboard"
 #define MOUSE_PREFS		"mouse"
 #define SOUND_PREFS		"sound"
@@ -660,9 +663,9 @@ remove_selected_device (CcBluetoothPanel *self)
 	adapter_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
 						       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
 						       NULL,
-						       "org.bluez",
+						       BLUEZ_SERVICE,
 						       adapter,
-						       "org.bluez.Adapter",
+						       ADAPTER_IFACE,
 						       NULL,
 						       &error);
 	g_free (adapter);